Merge branch 'master' of git.246060.ru:f1x1t/uncrustify

default.cfg

@@ -339,6 +339,9 @@ sp_after_semi_for_empty         = add      # ignore/add/remove/force
 # Add or remove space before '[' (except '[]').
 sp_before_square                = ignore   # ignore/add/remove/force
 
+# Add or remove space before '[' for asm block.
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+
 # Add or remove space before '[]'.
 sp_before_squares               = ignore   # ignore/add/remove/force
 
@@ -492,7 +495,10 @@ sp_func_proto_paren             = remove   # ignore/add/remove/force
 # without parameters.
 sp_func_proto_paren_empty       = remove   # ignore/add/remove/force
 
-# Add or remove space between function name and '(' on function definition.
+# Add or remove space between function name and '(' with a typedef specifier.
+sp_func_type_paren              = ignore   # ignore/add/remove/force
+
+# Add or remove space between alias name and '(' of a non-pointer function type typedef.
 sp_func_def_paren               = remove   # ignore/add/remove/force
 
 # Add or remove space between function name and '()' on function definition
@@ -1925,6 +1931,21 @@ nl_before_class                 = 0        # unsigned number
 # The number of newlines after '}' or ';' of a class definition.
 nl_after_class                  = 0        # unsigned number
 
+# The number of newlines before a namespace.
+nl_before_namespace             = 2        # unsigned number
+
+# The number of newlines after '{' of a namespace. This also adds newlines
+# before the matching '}'.
+#
+# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
+#     applicable, otherwise no change.
+#
+# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
+nl_inside_namespace             = 2        # unsigned number
+
+# The number of newlines after '}' of a namespace.
+nl_after_namespace              = 1        # unsigned number
+
 # The number of newlines before an access specifier label. This also includes
 # the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
 # if after a brace open.