changeset 739:cb542a15cc6f

Updated to uncrustify version 0.56 git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1016 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Sun, 19 Sep 2010 12:25:49 +0000
parents e05fd24c4417
children bc47ac0a44eb
files indenters/uigui_uncrustify.ini tools/uncrustify.cfg
diffstat 2 files changed, 492 insertions(+), 172 deletions(-) [+]
line wrap: on
line diff
--- a/indenters/uigui_uncrustify.ini	Sun Sep 19 12:24:50 2010 +0000
+++ b/indenters/uigui_uncrustify.ini	Sun Sep 19 12:25:49 2010 +0000
@@ -15,7 +15,7 @@
 showHelpParameter=-h
 stringparaminquotes=false
 useCfgFileParameter="-c "
-version=0.53
+version=0.56
 
 [Newlines]
 Category=0
@@ -48,7 +48,7 @@
 
 [String Escape Char]
 Category=0
-Description="<html>The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn)</html>"
+Description="<html>The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn)</html>"
 Enabled=false
 EditorType=numeric
 CallName="string_escape_char="
@@ -76,15 +76,33 @@
 MaxVal=16
 ValueDefault=8
 
+[Indent Continue]
+Category=1
+Description="<html>The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.<BR>For FreeBSD, this is set to 4.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_continue="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
 [Indent With Tabs]
 Category=1
-Description="<html>How to use tabs when indenting code<BR>0=spaces only<BR>1=indent with tabs, align with spaces<BR>2=indent and align with tabs</html>"
+Description="<html>How to use tabs when indenting code<BR>0=spaces only<BR>1=indent with tabs to brace level, align with spaces<BR>2=indent and align with tabs, using spaces when not on a tabstop</html>"
 Enabled=true
 EditorType=multiple
 Choices="indent_with_tabs=0|indent_with_tabs=1|indent_with_tabs=2"
 ChoicesReadable="Spaces only|Indent with tabs, align with spaces|Indent and align with tabs"
 ValueDefault=1
 
+[Indent Cmt With Tabs]
+Category=1
+Description="<html>Comments that are not a brace level are indented with tabs on a tabstop.<BR>Requires indent_with_tabs=2. If false, will use spaces.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_cmt_with_tabs=true|indent_cmt_with_tabs=false
+ValueDefault=0
+
 [Indent Align String]
 Category=1
 Description="<html>Whether to indent strings broken by '\' so that they line up</html>"
@@ -129,9 +147,25 @@
 TrueFalse=indent_braces_no_func=true|indent_braces_no_func=false
 ValueDefault=0
 
+[Indent Braces No Class]
+Category=1
+Description="<html>Disabled indenting class braces if indent_braces is true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_braces_no_class=true|indent_braces_no_class=false
+ValueDefault=0
+
+[Indent Braces No Struct]
+Category=1
+Description="<html>Disabled indenting struct braces if indent_braces is true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_braces_no_struct=true|indent_braces_no_struct=false
+ValueDefault=0
+
 [Indent Brace Parent]
 Category=1
-Description="<html>Indent based on the size of the brace parent, ie 'if' =&gt; 3 spaces, 'for' =&gt; 4 spaces, etc.</html>"
+Description="<html>Indent based on the size of the brace parent, i.e. 'if' =&gt; 3 spaces, 'for' =&gt; 4 spaces, etc.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_brace_parent=true|indent_brace_parent=false
@@ -145,6 +179,26 @@
 TrueFalse=indent_namespace=true|indent_namespace=false
 ValueDefault=0
 
+[Indent Namespace Level]
+Category=1
+Description="<html>The number of spaces to indent a namespace block</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_namespace_level="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Indent Namespace Limit]
+Category=1
+Description="<html>If the body of the namespace is longer than this number, it won't be indented.<BR>Requires indent_namespace=true. Default=0 (no limit)</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_namespace_limit="
+MinVal=0
+MaxVal=255
+ValueDefault=0
+
 [Indent Extern]
 Category=1
 Description="<html>Whether the 'extern "C"' body is indented</html>"
@@ -187,6 +241,14 @@
 MaxVal=16
 ValueDefault=0
 
+[Indent Var Def Cont]
+Category=1
+Description="<html>Indent continued variable declarations instead of aligning.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_var_def_cont=true|indent_var_def_cont=false
+ValueDefault=0
+
 [Indent Func Call Param]
 Category=1
 Description="<html>True:  indent continued function call parameters one indent level<BR>False: align parameters under the open paren</html>"
@@ -391,6 +453,14 @@
 TrueFalse=indent_bool_paren=true|indent_bool_paren=false
 ValueDefault=0
 
+[Indent First Bool Expr]
+Category=1
+Description="<html>If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
+ValueDefault=0
+
 [Indent Square Nl]
 Category=1
 Description="<html>If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)</html>"
@@ -433,6 +503,15 @@
 ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
 ValueDefault=0
 
+[Sp Assign Default]
+Category=2
+Description="<html>Add or remove space around assignment operator '=' in a prototype</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force"
+ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
+ValueDefault=0
+
 [Sp Before Assign]
 Category=2
 Description="<html>Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.</html>"
@@ -480,7 +559,7 @@
 
 [Sp Pp Concat]
 Category=2
-Description="<html>Add or remove space around preprocessor '##' concatenation operator</html>"
+Description="<html>Add or remove space around preprocessor '##' concatenation operator. Default=Add</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force"
@@ -489,7 +568,7 @@
 
 [Sp Pp Stringify]
 Category=2
-Description="<html>Add or remove space after preprocessor '#' stringify operator</html>"
+Description="<html>Add or remove space after preprocessor '#' stringify operator. Default=Add</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_pp_stringify=ignore|sp_pp_stringify=add|sp_pp_stringify=remove|sp_pp_stringify=force"
@@ -650,7 +729,7 @@
 
 [Sp After Type]
 Category=2
-Description="<html>Add or remove space between type and word</html>"
+Description="<html>Add or remove space between type and word. Default=Force</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force"
@@ -785,12 +864,12 @@
 
 [Sp Before Semi]
 Category=2
-Description="<html>Add or remove space before ';'</html>"
+Description="<html>Add or remove space before ';'. Default=Remove</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force"
 ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
-ValueDefault=0
+ValueDefault=2
 
 [Sp Before Semi For]
 Category=2
@@ -803,16 +882,34 @@
 
 [Sp Before Semi For Empty]
 Category=2
-Description="<html>Add or remove space before a semicolon of an empty part of a for statment.</html>"
+Description="<html>Add or remove space before a semicolon of an empty part of a for statement.</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_before_semi_for_empty=ignore|sp_before_semi_for_empty=add|sp_before_semi_for_empty=remove|sp_before_semi_for_empty=force"
 ChoicesReadable="Ignore Sp Before Semi For Empty|Add Sp Before Semi For Empty|Remove Sp Before Semi For Empty|Force Sp Before Semi For Empty"
 ValueDefault=0
 
+[Sp After Semi]
+Category=2
+Description="<html>Add or remove space after ';', except when followed by a comment. Default=Add</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force"
+ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
+ValueDefault=1
+
+[Sp After Semi For]
+Category=2
+Description="<html>Add or remove space after ';' in non-empty 'for' statements. Default=Force</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_after_semi_for=ignore|sp_after_semi_for=add|sp_after_semi_for=remove|sp_after_semi_for=force"
+ChoicesReadable="Ignore Sp After Semi For|Add Sp After Semi For|Remove Sp After Semi For|Force Sp After Semi For"
+ValueDefault=3
+
 [Sp After Semi For Empty]
 Category=2
-Description="<html>Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; &lt;here&gt; ).</html>"
+Description="<html>Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; &lt;here&gt; ).</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_after_semi_for_empty=ignore|sp_after_semi_for_empty=add|sp_after_semi_for_empty=remove|sp_after_semi_for_empty=force"
@@ -864,6 +961,15 @@
 ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
 ValueDefault=2
 
+[Sp Before Ellipsis]
+Category=2
+Description="<html>Add or remove space before the variadic '...' when preceded by a non-punctuator</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force"
+ChoicesReadable="Ignore Sp Before Ellipsis|Add Sp Before Ellipsis|Remove Sp Before Ellipsis|Force Sp Before Ellipsis"
+ValueDefault=0
+
 [Sp After Class Colon]
 Category=2
 Description="<html>Add or remove space after class ':'</html>"
@@ -884,7 +990,7 @@
 
 [Sp Before Case Colon]
 Category=2
-Description="<html>Add or remove space before case ':'</html>"
+Description="<html>Add or remove space before case ':'. Default=Remove</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_before_case_colon=ignore|sp_before_case_colon=add|sp_before_case_colon=remove|sp_before_case_colon=force"
@@ -911,7 +1017,7 @@
 
 [Sp After Cast]
 Category=2
-Description="<html>Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'</html>"
+Description="<html>Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force"
@@ -929,7 +1035,7 @@
 
 [Sp Cpp Cast Paren]
 Category=2
-Description="<html>Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)'</html>"
+Description="<html>Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_cpp_cast_paren=ignore|sp_cpp_cast_paren=add|sp_cpp_cast_paren=remove|sp_cpp_cast_paren=force"
@@ -1244,7 +1350,7 @@
 
 [Sp Not]
 Category=2
-Description="<html>Add or remove space after the '!' (not) operator.</html>"
+Description="<html>Add or remove space after the '!' (not) operator. Default=Remove</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force"
@@ -1253,7 +1359,7 @@
 
 [Sp Inv]
 Category=2
-Description="<html>Add or remove space after the '~' (invert) operator.</html>"
+Description="<html>Add or remove space after the '~' (invert) operator. Default=Remove</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force"
@@ -1262,7 +1368,7 @@
 
 [Sp Addr]
 Category=2
-Description="<html>Add or remove space after the '&amp;' (address-of) operator.<BR>This does not affect the spacing after a '&amp;' that is part of a type.</html>"
+Description="<html>Add or remove space after the '&amp;' (address-of) operator. Default=Remove<BR>This does not affect the spacing after a '&amp;' that is part of a type.</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force"
@@ -1271,7 +1377,7 @@
 
 [Sp Member]
 Category=2
-Description="<html>Add or remove space around the '.' or '-&gt;' operators<BR></html>"
+Description="<html>Add or remove space around the '.' or '-&gt;' operators. Default=Remove</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force"
@@ -1280,7 +1386,7 @@
 
 [Sp Deref]
 Category=2
-Description="<html>Add or remove space after the '*' (dereference) operator.<BR>This does not affect the spacing after a '*' that is part of a type.</html>"
+Description="<html>Add or remove space after the '*' (dereference) operator. Default=Remove<BR>This does not affect the spacing after a '*' that is part of a type.</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force"
@@ -1289,7 +1395,7 @@
 
 [Sp Sign]
 Category=2
-Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'</html>"
+Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force"
@@ -1298,7 +1404,7 @@
 
 [Sp Incdec]
 Category=2
-Description="<html>Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'</html>"
+Description="<html>Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force"
@@ -1307,7 +1413,7 @@
 
 [Sp Before Nl Cont]
 Category=2
-Description="<html>Add or remove space before a backslash-newline at the end of a line</html>"
+Description="<html>Add or remove space before a backslash-newline at the end of a line. Default=Add</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_before_nl_cont=ignore|sp_before_nl_cont=add|sp_before_nl_cont=remove|sp_before_nl_cont=force"
@@ -1361,13 +1467,67 @@
 
 [Sp After Oc Type]
 Category=2
-Description="<html>Add or remove space after the (type) in message specs<BR>'-(int) f: (int) x;' vs '-(int) f: (int)x;'</html>"
+Description="<html>Add or remove space after the (type) in message specs<BR>'-(int)f: (int) x;' vs '-(int)f: (int)x;'</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force"
 ChoicesReadable="Ignore Sp After Oc Type|Add Sp After Oc Type|Remove Sp After Oc Type|Force Sp After Oc Type"
 ValueDefault=0
 
+[Sp After Oc Return Type]
+Category=2
+Description="<html>Add or remove space after the first (type) in message specs<BR>'-(int) f:(int)x;' vs '-(int)f:(int)x;'</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_after_oc_return_type=ignore|sp_after_oc_return_type=add|sp_after_oc_return_type=remove|sp_after_oc_return_type=force"
+ChoicesReadable="Ignore Sp After Oc Return Type|Add Sp After Oc Return Type|Remove Sp After Oc Return Type|Force Sp After Oc Return Type"
+ValueDefault=0
+
+[Sp After Oc At Sel]
+Category=2
+Description="<html>Add or remove space between '@selector' and '('<BR>'@selector(msgName)' vs '@selector (msgName)'<BR>Also applies to @protocol() constructs</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_after_oc_at_sel=ignore|sp_after_oc_at_sel=add|sp_after_oc_at_sel=remove|sp_after_oc_at_sel=force"
+ChoicesReadable="Ignore Sp After Oc At Sel|Add Sp After Oc At Sel|Remove Sp After Oc At Sel|Force Sp After Oc At Sel"
+ValueDefault=0
+
+[Sp After Oc At Sel Parens]
+Category=2
+Description="<html>Add or remove space between '@selector(x)' and the following word<BR>'@selector(foo) a:' vs '@selector(foo)a:'</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_after_oc_at_sel_parens=ignore|sp_after_oc_at_sel_parens=add|sp_after_oc_at_sel_parens=remove|sp_after_oc_at_sel_parens=force"
+ChoicesReadable="Ignore Sp After Oc At Sel Parens|Add Sp After Oc At Sel Parens|Remove Sp After Oc At Sel Parens|Force Sp After Oc At Sel Parens"
+ValueDefault=0
+
+[Sp Inside Oc At Sel Parens]
+Category=2
+Description="<html>Add or remove space inside '@selector' parens<BR>'@selector(foo)' vs '@selector( foo )'<BR>Also applies to @protocol() constructs</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_inside_oc_at_sel_parens=ignore|sp_inside_oc_at_sel_parens=add|sp_inside_oc_at_sel_parens=remove|sp_inside_oc_at_sel_parens=force"
+ChoicesReadable="Ignore Sp Inside Oc At Sel Parens|Add Sp Inside Oc At Sel Parens|Remove Sp Inside Oc At Sel Parens|Force Sp Inside Oc At Sel Parens"
+ValueDefault=0
+
+[Sp Before Oc Block Caret]
+Category=2
+Description="<html>Add or remove space before a block pointer caret<BR>'^int (int arg){...}' vs. ' ^int (int arg){...}'</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_before_oc_block_caret=ignore|sp_before_oc_block_caret=add|sp_before_oc_block_caret=remove|sp_before_oc_block_caret=force"
+ChoicesReadable="Ignore Sp Before Oc Block Caret|Add Sp Before Oc Block Caret|Remove Sp Before Oc Block Caret|Force Sp Before Oc Block Caret"
+ValueDefault=0
+
+[Sp After Oc Block Caret]
+Category=2
+Description="<html>Add or remove space after a block pointer caret<BR>'^int (int arg){...}' vs. '^ int (int arg){...}'</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_after_oc_block_caret=ignore|sp_after_oc_block_caret=add|sp_after_oc_block_caret=remove|sp_after_oc_block_caret=force"
+ChoicesReadable="Ignore Sp After Oc Block Caret|Add Sp After Oc Block Caret|Remove Sp After Oc Block Caret|Force Sp After Oc Block Caret"
+ValueDefault=0
+
 [Sp Cond Colon]
 Category=2
 Description="<html>Add or remove space around the ':' in 'b ? t : f'</html>"
@@ -1413,6 +1573,15 @@
 ChoicesReadable="Ignore Sp Cmt Cpp Start|Add Sp Cmt Cpp Start|Remove Sp Cmt Cpp Start|Force Sp Cmt Cpp Start"
 ValueDefault=0
 
+[Sp Endif Cmt]
+Category=2
+Description="<html>Controls the spaces between #else or #endif and a trailing comment</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_endif_cmt=ignore|sp_endif_cmt=add|sp_endif_cmt=remove|sp_endif_cmt=force"
+ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
+ValueDefault=0
+
 [Align Keep Tabs]
 Category=3
 Description="<html>Whether to keep non-indenting tabs</html>"
@@ -1423,7 +1592,7 @@
 
 [Align With Tabs]
 Category=3
-Description="<html>Whether to use tabs for alinging</html>"
+Description="<html>Whether to use tabs for aligning</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_with_tabs=true|align_with_tabs=false
@@ -1647,7 +1816,7 @@
 
 [Align Typedef Star Style]
 Category=3
-Description="<html>Controls the positioning of the '*' in typedefs. Just try it.<BR>0: Align on typdef type, ignore '*'<BR>1: The '*' is part of type name: typedef int  *pint;<BR>2: The '*' is part of the type, but dangling: typedef int *pint;</html>"
+Description="<html>Controls the positioning of the '*' in typedefs. Just try it.<BR>0: Align on typedef type, ignore '*'<BR>1: The '*' is part of type name: typedef int  *pint;<BR>2: The '*' is part of the type, but dangling: typedef int *pint;</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_typedef_star_style="
@@ -1657,7 +1826,7 @@
 
 [Align Typedef Amp Style]
 Category=3
-Description="<html>Controls the positioning of the '&amp;' in typedefs. Just try it.<BR>0: Align on typdef type, ignore '&amp;'<BR>1: The '&amp;' is part of type name: typedef int  &amp;pint;<BR>2: The '&amp;' is part of the type, but dangling: typedef int &amp;pint;</html>"
+Description="<html>Controls the positioning of the '&amp;' in typedefs. Just try it.<BR>0: Align on typedef type, ignore '&amp;'<BR>1: The '&amp;' is part of type name: typedef int  &amp;pint;<BR>2: The '&amp;' is part of the type, but dangling: typedef int &amp;pint;</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_typedef_amp_style="
@@ -1685,7 +1854,7 @@
 
 [Align Right Cmt Gap]
 Category=3
-Description="<html>If a trailing comment is more than this number of columns away from the text it follows,<BR>it will qualify for being aligned.</html>"
+Description="<html>If a trailing comment is more than this number of columns away from the text it follows,<BR>it will qualify for being aligned. This has to be &gt; 0 to do anything.</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_right_cmt_gap="
@@ -1811,6 +1980,24 @@
 TrueFalse=align_left_shift=true|align_left_shift=false
 ValueDefault=1
 
+[Align Oc Msg Colon Span]
+Category=3
+Description="<html>Span for aligning parameters in an Obj-C message call on the ':' (0=don't align)</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_oc_msg_colon_span="
+MinVal=5000
+MaxVal=16
+ValueDefault=0
+
+[Align Oc Decl Colon]
+Category=3
+Description="<html>Aligning parameters in an Obj-C '+' or '-' declaration on the ':'</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_oc_decl_colon=true|align_oc_decl_colon=false
+ValueDefault=0
+
 [Nl Collapse Empty Body]
 Category=4
 Description="<html>Whether to collapse empty blocks between '{' and '}'</html>"
@@ -1934,7 +2121,7 @@
 
 [Nl Func Var Def Blk]
 Category=4
-Description="<html>The number of newlines after a block of variable definitions</html>"
+Description="<html>The number of blank lines after a block of variable definitions</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_func_var_def_blk="
@@ -2095,6 +2282,24 @@
 ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
 ValueDefault=0
 
+[Nl Using Brace]
+Category=4
+Description="<html>Add or remove newline between 'using' and '{'</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_using_brace=ignore|nl_using_brace=add|nl_using_brace=remove|nl_using_brace=force"
+ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
+ValueDefault=0
+
+[Nl Brace Brace]
+Category=4
+Description="<html>Add or remove newline between two open or close braces.<BR>Due to general newline/brace handling, REMOVE may not work.</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_brace_brace=ignore|nl_brace_brace=add|nl_brace_brace=remove|nl_brace_brace=force"
+ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
+ValueDefault=0
+
 [Nl Do Brace]
 Category=4
 Description="<html>Add or remove newline between 'do' and '{'</html>"
@@ -2201,13 +2406,22 @@
 
 [Nl Func Type Name]
 Category=4
-Description="<html>Add or remove newline between return type and function name in definition</html>"
+Description="<html>Add or remove newline between return type and function name in a function definition</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force"
 ChoicesReadable="Ignore Nl Func Type Name|Add Nl Func Type Name|Remove Nl Func Type Name|Force Nl Func Type Name"
 ValueDefault=0
 
+[Nl Func Type Name Class]
+Category=4
+Description="<html>Add or remove newline between return type and function name inside a class {}<BR>Uses nl_func_type_name or nl_func_proto_type_name if set to ignore.</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_func_type_name_class=ignore|nl_func_type_name_class=add|nl_func_type_name_class=remove|nl_func_type_name_class=force"
+ChoicesReadable="Ignore Nl Func Type Name Class|Add Nl Func Type Name Class|Remove Nl Func Type Name Class|Force Nl Func Type Name Class"
+ValueDefault=0
+
 [Nl Func Scope Name]
 Category=4
 Description="<html>Add or remove newline between function scope and name in a definition<BR>Controls the newline after '::' in 'void A::f() { }'</html>"
@@ -2244,6 +2458,15 @@
 ChoicesReadable="Ignore Nl Func Decl Start|Add Nl Func Decl Start|Remove Nl Func Decl Start|Force Nl Func Decl Start"
 ValueDefault=0
 
+[Nl Func Decl Start Single]
+Category=4
+Description="<html>Overrides nl_func_decl_start when there is only one paramter.</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_func_decl_start_single=ignore|nl_func_decl_start_single=add|nl_func_decl_start_single=remove|nl_func_decl_start_single=force"
+ChoicesReadable="Ignore Nl Func Decl Start Single|Add Nl Func Decl Start Single|Remove Nl Func Decl Start Single|Force Nl Func Decl Start Single"
+ValueDefault=0
+
 [Nl Func Decl Args]
 Category=4
 Description="<html>Add or remove newline after each ',' in a function declaration</html>"
@@ -2262,6 +2485,24 @@
 ChoicesReadable="Ignore Nl Func Decl End|Add Nl Func Decl End|Remove Nl Func Decl End|Force Nl Func Decl End"
 ValueDefault=0
 
+[Nl Func Decl End Single]
+Category=4
+Description="<html>Overrides nl_func_decl_end when there is only one paramter.</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_func_decl_end_single=ignore|nl_func_decl_end_single=add|nl_func_decl_end_single=remove|nl_func_decl_end_single=force"
+ChoicesReadable="Ignore Nl Func Decl End Single|Add Nl Func Decl End Single|Remove Nl Func Decl End Single|Force Nl Func Decl End Single"
+ValueDefault=0
+
+[Nl Func Decl Empty]
+Category=4
+Description="<html>Add or remove newline between '()' in a function declaration.</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_func_decl_empty=ignore|nl_func_decl_empty=add|nl_func_decl_empty=remove|nl_func_decl_empty=force"
+ChoicesReadable="Ignore Nl Func Decl Empty|Add Nl Func Decl Empty|Remove Nl Func Decl Empty|Force Nl Func Decl Empty"
+ValueDefault=0
+
 [Nl Fdef Brace]
 Category=4
 Description="<html>Add or remove newline between function signature and '{'</html>"
@@ -2314,12 +2555,20 @@
 
 [Nl After Vbrace Open]
 Category=4
-Description="<html>Whether to put a newline after a virtual brace open.<BR>These occur in un-braced if/while/do/for statement bodies.</html>"
+Description="<html>Whether to put a newline after a virtual brace open with a non-empty body.<BR>These occur in un-braced if/while/do/for statement bodies.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_vbrace_open=true|nl_after_vbrace_open=false
 ValueDefault=0
 
+[Nl After Vbrace Open Empty]
+Category=4
+Description="<html>Whether to put a newline after a virtual brace open with an empty body.<BR>These occur in un-braced if/while/do/for statement bodies.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_vbrace_open_empty=true|nl_after_vbrace_open_empty=false
+ValueDefault=0
+
 [Nl After Brace Close]
 Category=4
 Description="<html>Whether to put a newline after a brace close.<BR>Does not apply if followed by a necessary ';'.</html>"
@@ -2328,6 +2577,14 @@
 TrueFalse=nl_after_brace_close=true|nl_after_brace_close=false
 ValueDefault=0
 
+[Nl After Vbrace Close]
+Category=4
+Description="<html>Whether to put a newline after a virtual brace close.<BR>Would add a newline before return in: 'if (foo) a++; return;'</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_vbrace_close=true|nl_after_vbrace_close=false
+ValueDefault=0
+
 [Nl Define Macro]
 Category=4
 Description="<html>Whether to alter newlines in '#define' macros</html>"
@@ -2346,7 +2603,7 @@
 
 [Nl Before If]
 Category=4
-Description="<html>Add or remove newline before 'if'</html>"
+Description="<html>Add or remove blank line before 'if'</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force"
@@ -2355,7 +2612,7 @@
 
 [Nl After If]
 Category=4
-Description="<html>Add or remove newline after 'if'</html>"
+Description="<html>Add or remove blank line after 'if' statement</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force"
@@ -2364,7 +2621,7 @@
 
 [Nl Before For]
 Category=4
-Description="<html>Add or remove newline before 'for'</html>"
+Description="<html>Add or remove blank line before 'for'</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force"
@@ -2373,7 +2630,7 @@
 
 [Nl After For]
 Category=4
-Description="<html>Add or remove newline after 'for'</html>"
+Description="<html>Add or remove blank line after 'for' statement</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force"
@@ -2382,7 +2639,7 @@
 
 [Nl Before While]
 Category=4
-Description="<html>Add or remove newline before 'while'</html>"
+Description="<html>Add or remove blank line before 'while'</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force"
@@ -2391,7 +2648,7 @@
 
 [Nl After While]
 Category=4
-Description="<html>Add or remove newline after 'while'</html>"
+Description="<html>Add or remove blank line after 'while' statement</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force"
@@ -2400,7 +2657,7 @@
 
 [Nl Before Switch]
 Category=4
-Description="<html>Add or remove newline before 'switch'</html>"
+Description="<html>Add or remove blank line before 'switch'</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force"
@@ -2409,7 +2666,7 @@
 
 [Nl After Switch]
 Category=4
-Description="<html>Add or remove newline after 'switch'</html>"
+Description="<html>Add or remove blank line after 'switch' statement</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force"
@@ -2418,7 +2675,7 @@
 
 [Nl Before Do]
 Category=4
-Description="<html>Add or remove newline before 'do'</html>"
+Description="<html>Add or remove blank line before 'do'</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force"
@@ -2427,7 +2684,7 @@
 
 [Nl After Do]
 Category=4
-Description="<html>Add or remove newline after 'do'</html>"
+Description="<html>Add or remove blank line after 'do/while' statement</html>"
 Enabled=false
 EditorType=multiple
 Choices="nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force"
@@ -2444,7 +2701,7 @@
 
 [Nl Ds Struct Enum Close Brace]
 Category=4
-Description="<html>Whether to double-space before the close brace of a struct/union/enum</html>"
+Description="<html>Whether to double-space before the close brace of a struct/union/enum<BR>(lower priority than 'eat_blanks_before_close_brace')</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_ds_struct_enum_close_brace=true|nl_ds_struct_enum_close_brace=false
@@ -2488,16 +2745,16 @@
 Description="<html>The position of arithmetic operators in wrapped expressions</html>"
 Enabled=false
 EditorType=multiple
-Choices="pos_arith=ignore|pos_arith=lead|pos_arith=trail"
+Choices="pos_arith=ignore|pos_arith=lead|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail|pos_arith=trail_break|pos_arith=trail_force"
 ChoicesReadable="Ignore Pos Arith|Lead Pos Arith|Trail Pos Arith"
 ValueDefault=0
 
 [Pos Assign]
 Category=5
-Description="<html>The position of assignment in wrapped expressions</html>"
+Description="<html>The position of assignment in wrapped expressions.<BR>Do not affect '=' followed by '{'</html>"
 Enabled=false
 EditorType=multiple
-Choices="pos_assign=ignore|pos_assign=lead|pos_assign=trail"
+Choices="pos_assign=ignore|pos_assign=lead|pos_assign=lead_break|pos_assign=lead_force|pos_assign=trail|pos_assign=trail_break|pos_assign=trail_force"
 ChoicesReadable="Ignore Pos Assign|Lead Pos Assign|Trail Pos Assign"
 ValueDefault=0
 
@@ -2506,16 +2763,34 @@
 Description="<html>The position of boolean operators in wrapped expressions</html>"
 Enabled=false
 EditorType=multiple
-Choices="pos_bool=ignore|pos_bool=lead|pos_bool=trail"
+Choices="pos_bool=ignore|pos_bool=lead|pos_bool=lead_break|pos_bool=lead_force|pos_bool=trail|pos_bool=trail_break|pos_bool=trail_force"
 ChoicesReadable="Ignore Pos Bool|Lead Pos Bool|Trail Pos Bool"
 ValueDefault=0
 
+[Pos Compare]
+Category=5
+Description="<html>The position of comparison operators in wrapped expressions</html>"
+Enabled=false
+EditorType=multiple
+Choices="pos_compare=ignore|pos_compare=lead|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail|pos_compare=trail_break|pos_compare=trail_force"
+ChoicesReadable="Ignore Pos Compare|Lead Pos Compare|Trail Pos Compare"
+ValueDefault=0
+
+[Pos Conditional]
+Category=5
+Description="<html>The position of conditional (b ? t : f) operators in wrapped expressions</html>"
+Enabled=false
+EditorType=multiple
+Choices="pos_conditional=ignore|pos_conditional=lead|pos_conditional=lead_break|pos_conditional=lead_force|pos_conditional=trail|pos_conditional=trail_break|pos_conditional=trail_force"
+ChoicesReadable="Ignore Pos Conditional|Lead Pos Conditional|Trail Pos Conditional"
+ValueDefault=0
+
 [Pos Comma]
 Category=5
 Description="<html>The position of the comma in wrapped expressions</html>"
 Enabled=false
 EditorType=multiple
-Choices="pos_comma=ignore|pos_comma=lead|pos_comma=trail"
+Choices="pos_comma=ignore|pos_comma=lead|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail|pos_comma=trail_break|pos_comma=trail_force"
 ChoicesReadable="Ignore Pos Comma|Lead Pos Comma|Trail Pos Comma"
 ValueDefault=0
 
@@ -2524,7 +2799,7 @@
 Description="<html>The position of the comma in the constructor initialization list</html>"
 Enabled=false
 EditorType=multiple
-Choices="pos_class_comma=ignore|pos_class_comma=lead|pos_class_comma=trail"
+Choices="pos_class_comma=ignore|pos_class_comma=lead|pos_class_comma=lead_break|pos_class_comma=lead_force|pos_class_comma=trail|pos_class_comma=trail_break|pos_class_comma=trail_force"
 ChoicesReadable="Ignore Pos Class Comma|Lead Pos Class Comma|Trail Pos Class Comma"
 ValueDefault=0
 
@@ -2533,7 +2808,7 @@
 Description="<html>The position of colons between constructor and member initialization</html>"
 Enabled=false
 EditorType=multiple
-Choices="pos_class_colon=ignore|pos_class_colon=lead|pos_class_colon=trail"
+Choices="pos_class_colon=ignore|pos_class_colon=lead|pos_class_colon=lead_break|pos_class_colon=lead_force|pos_class_colon=trail|pos_class_colon=trail_break|pos_class_colon=trail_force"
 ChoicesReadable="Ignore Pos Class Colon|Lead Pos Class Colon|Trail Pos Class Colon"
 ValueDefault=0
 
@@ -2645,7 +2920,7 @@
 
 [Nl After Multiline Comment]
 Category=7
-Description="<html>Whether to force a newline after a mulit-line comment.</html>"
+Description="<html>Whether to force a newline after a multi-line comment.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_multiline_comment=true|nl_after_multiline_comment=false
@@ -2747,7 +3022,7 @@
 
 [Mod Full Brace Function]
 Category=8
-Description="<html>Add or remove braces on single-line function defintions. (Pawn)</html>"
+Description="<html>Add or remove braces on single-line function definitions. (Pawn)</html>"
 Enabled=false
 EditorType=multiple
 Choices="mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force"
@@ -2763,6 +3038,14 @@
 ChoicesReadable="Ignore Mod Full Brace If|Add Mod Full Brace If|Remove Mod Full Brace If|Force Mod Full Brace If"
 ValueDefault=0
 
+[Mod Full Brace If Chain]
+Category=8
+Description="<html>Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.<BR>If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
+ValueDefault=0
+
 [Mod Full Brace Nl]
 Category=8
 Description="<html>Don't remove braces around statements that span N newlines</html>"
@@ -2782,6 +3065,15 @@
 ChoicesReadable="Ignore Mod Full Brace While|Add Mod Full Brace While|Remove Mod Full Brace While|Force Mod Full Brace While"
 ValueDefault=0
 
+[Mod Full Brace Using]
+Category=8
+Description="<html>Add or remove braces on single-line 'using ()' statement</html>"
+Enabled=false
+EditorType=multiple
+Choices="mod_full_brace_using=ignore|mod_full_brace_using=add|mod_full_brace_using=remove|mod_full_brace_using=force"
+ChoicesReadable="Ignore Mod Full Brace Using|Add Mod Full Brace Using|Remove Mod Full Brace Using|Force Mod Full Brace Using"
+ValueDefault=0
+
 [Mod Paren On Return]
 Category=8
 Description="<html>Add or remove unnecessary paren on 'return' statement</html>"
@@ -2887,6 +3179,15 @@
 TrueFalse=mod_move_case_break=true|mod_move_case_break=false
 ValueDefault=0
 
+[Mod Case Brace]
+Category=8
+Description="<html>Will add or remove the braces around a fully braced case statement.<BR>Will only remove the braces if there are no variable declarations in the block.</html>"
+Enabled=false
+EditorType=multiple
+Choices="mod_case_brace=ignore|mod_case_brace=add|mod_case_brace=remove|mod_case_brace=force"
+ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
+ValueDefault=0
+
 [Mod Remove Empty Return]
 Category=8
 Description="<html>If TRUE, it will remove a void 'return;' that appears as the last statement in a function.</html>"
@@ -2905,9 +3206,19 @@
 MaxVal=256
 ValueDefault=0
 
+[Cmt Reflow Mode]
+Category=9
+Description="<html>Set the comment reflow mode (default: 0)<BR>0: no reflowing (apart from the line wrapping due to cmt_width)<BR>1: no touching at all<BR>2: full reflow<BR></html>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_reflow_mode="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
 [Cmt Indent Multi]
 Category=9
-Description="<html>If false, disable all multi-line comment changes, including cmt_width and leading chars.<BR>Default is true.</html>"
+Description="<html>If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars.<BR>Default is true.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false
@@ -3007,7 +3318,7 @@
 
 [Cmt Insert File Header]
 Category=9
-Description="<html>The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.<BR>Will substitue $(filename) with the current file's name.</html>"
+Description="<html>The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.<BR>Will substitute $(filename) with the current file's name.</html>"
 Enabled=false
 CallName=cmt_insert_file_header=
 EditorType=string
@@ -3015,7 +3326,7 @@
 
 [Cmt Insert File Footer]
 Category=9
-Description="<html>The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.<BR>Will substitue $(filename) with the current file's name.</html>"
+Description="<html>The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.<BR>Will substitute $(filename) with the current file's name.</html>"
 Enabled=false
 CallName=cmt_insert_file_footer=
 EditorType=string
@@ -3023,7 +3334,7 @@
 
 [Cmt Insert Func Header]
 Category=9
-Description="<html>The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment.<BR>Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.<BR>Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }</html>"
+Description="<html>The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.<BR>Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.<BR>Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }</html>"
 Enabled=false
 CallName=cmt_insert_func_header=
 EditorType=string
@@ -3031,7 +3342,7 @@
 
 [Cmt Insert Class Header]
 Category=9
-Description="<html>The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment.<BR>Will substitue $(class) with the class name.</html>"
+Description="<html>The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.<BR>Will substitute $(class) with the class name.</html>"
 Enabled=false
 CallName=cmt_insert_class_header=
 EditorType=string
--- a/tools/uncrustify.cfg	Sun Sep 19 12:24:50 2010 +0000
+++ b/tools/uncrustify.cfg	Sun Sep 19 12:25:49 2010 +0000
@@ -1,117 +1,126 @@
-indent_align_string=false
-indent_braces=false
-indent_braces_no_func=false
-indent_brace_parent=false
-indent_namespace=false
-indent_extern=false
-indent_class=true
-indent_class_colon=false
-indent_else_if=false
-indent_func_call_param=true
-indent_func_def_param=false
-indent_func_proto_param=false
-indent_func_class_param=false
-indent_func_ctor_var_param=false
-indent_template_param=false
-indent_func_param_double=false
-indent_relative_single_line_comments=false
-indent_col1_comment=true
-indent_access_spec_body=false
-indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
-indent_square_nl=false
-indent_preserve_sql=false
-indent_align_assign=true
-sp_balance_nested_parens=false
-align_keep_tabs=false
-align_with_tabs=false
-align_on_tabstop=false
-align_number_left=false
-align_func_params=false
-align_same_func_call_params=false
-align_var_def_colon=false
-align_var_def_attribute=false
-align_var_def_inline=false
-align_right_cmt_mix=false
-align_on_operator=false
-align_mix_var_proto=false
-align_single_line_func=false
-align_single_line_brace=false
-align_nl_cont=false
-align_left_shift=false
-nl_collapse_empty_body=false
-nl_assign_leave_one_liners=false
-nl_class_leave_one_liners=false
-nl_enum_leave_one_liners=false
-nl_getset_leave_one_liners=false
-nl_func_leave_one_liners=false
-nl_if_leave_one_liners=false
-nl_multi_line_cond=false
-nl_multi_line_define=false
-nl_before_case=false
-nl_after_case=false
-nl_after_return=false
-nl_after_semicolon=false
-nl_after_brace_open=false
-nl_after_brace_open_cmt=false
-nl_after_vbrace_open=false
-nl_after_brace_close=false
-nl_define_macro=false
-nl_squeeze_ifdef=false
-nl_ds_struct_enum_cmt=false
-nl_ds_struct_enum_close_brace=false
-nl_create_if_one_liner=false
-nl_create_for_one_liner=false
-nl_create_while_one_liner=false
-ls_for_split_full=false
-ls_func_split_full=false
-nl_after_multiline_comment=false
-eat_blanks_after_open_brace=true
-eat_blanks_before_close_brace=true
-mod_pawn_semicolon=false
-mod_full_paren_if_bool=false
-mod_remove_extra_semicolon=false
-mod_sort_import=false
-mod_sort_using=false
-mod_sort_include=false
-mod_move_case_break=false
-mod_remove_empty_return=false
-cmt_indent_multi=false
-cmt_c_group=false
-cmt_c_nl_start=false
-cmt_c_nl_end=false
-cmt_cpp_group=false
-cmt_cpp_nl_start=false
-cmt_cpp_nl_end=false
-cmt_cpp_to_c=false
-cmt_star_cont=false
-cmt_multi_check_last=true
-cmt_insert_before_preproc=false
-pp_indent_at_level=false
-pp_region_indent_code=false
-pp_if_indent_code=false
-pp_define_at_level=false
-input_tab_size=4
-indent_columns=4
-indent_switch_case=4
-indent_with_tabs=0
-sp_after_type=ignore
-sp_before_sparen=add
-sp_after_sparen=add
-sp_before_case_colon=add
-sp_func_proto_paren=remove
-sp_func_def_paren=remove
-sp_fparen_brace=add
-nl_end_of_file=add
-nl_if_brace=remove
-nl_brace_else=add
-nl_elseif_brace=remove
-nl_else_brace=remove
-nl_else_if=remove
-nl_for_brace=remove
-nl_while_brace=remove
-nl_do_brace=remove
-nl_switch_brace=remove
-nl_fdef_brace=remove
-nl_class_colon=remove
+indent_cmt_with_tabs=false
+indent_align_string=false
+indent_braces=false
+indent_braces_no_func=false
+indent_braces_no_class=false
+indent_braces_no_struct=false
+indent_brace_parent=false
+indent_namespace=false
+indent_extern=false
+indent_class=true
+indent_class_colon=false
+indent_else_if=false
+indent_var_def_cont=false
+indent_func_call_param=true
+indent_func_def_param=false
+indent_func_proto_param=false
+indent_func_class_param=false
+indent_func_ctor_var_param=false
+indent_template_param=false
+indent_func_param_double=false
+indent_relative_single_line_comments=false
+indent_col1_comment=true
+indent_access_spec_body=false
+indent_paren_nl=false
+indent_comma_paren=false
+indent_bool_paren=false
+indent_first_bool_expr=false
+indent_square_nl=false
+indent_preserve_sql=false
+indent_align_assign=true
+sp_balance_nested_parens=false
+align_keep_tabs=false
+align_with_tabs=false
+align_on_tabstop=false
+align_number_left=false
+align_func_params=false
+align_same_func_call_params=false
+align_var_def_colon=false
+align_var_def_attribute=false
+align_var_def_inline=false
+align_right_cmt_mix=false
+align_on_operator=false
+align_mix_var_proto=false
+align_single_line_func=false
+align_single_line_brace=false
+align_nl_cont=false
+align_left_shift=false
+align_oc_decl_colon=false
+nl_collapse_empty_body=false
+nl_assign_leave_one_liners=false
+nl_class_leave_one_liners=false
+nl_enum_leave_one_liners=false
+nl_getset_leave_one_liners=false
+nl_func_leave_one_liners=false
+nl_if_leave_one_liners=false
+nl_multi_line_cond=false
+nl_multi_line_define=false
+nl_before_case=false
+nl_after_case=false
+nl_after_return=false
+nl_after_semicolon=false
+nl_after_brace_open=false
+nl_after_brace_open_cmt=false
+nl_after_vbrace_open=false
+nl_after_vbrace_open_empty=false
+nl_after_brace_close=false
+nl_after_vbrace_close=false
+nl_define_macro=false
+nl_squeeze_ifdef=false
+nl_ds_struct_enum_cmt=false
+nl_ds_struct_enum_close_brace=false
+nl_create_if_one_liner=false
+nl_create_for_one_liner=false
+nl_create_while_one_liner=false
+ls_for_split_full=false
+ls_func_split_full=false
+nl_after_multiline_comment=false
+eat_blanks_after_open_brace=true
+eat_blanks_before_close_brace=true
+mod_full_brace_if_chain=false
+mod_pawn_semicolon=false
+mod_full_paren_if_bool=false
+mod_remove_extra_semicolon=false
+mod_sort_import=false
+mod_sort_using=false
+mod_sort_include=false
+mod_move_case_break=false
+mod_remove_empty_return=false
+cmt_indent_multi=false
+cmt_c_group=false
+cmt_c_nl_start=false
+cmt_c_nl_end=false
+cmt_cpp_group=false
+cmt_cpp_nl_start=false
+cmt_cpp_nl_end=false
+cmt_cpp_to_c=false
+cmt_star_cont=false
+cmt_multi_check_last=true
+cmt_insert_before_preproc=false
+pp_indent_at_level=false
+pp_region_indent_code=false
+pp_if_indent_code=false
+pp_define_at_level=false
+input_tab_size=4
+indent_columns=4
+indent_switch_case=4
+indent_with_tabs=0
+sp_after_type=ignore
+sp_before_sparen=add
+sp_after_sparen=add
+sp_before_case_colon=add
+sp_func_proto_paren=remove
+sp_func_def_paren=remove
+sp_fparen_brace=add
+nl_end_of_file=add
+nl_if_brace=remove
+nl_brace_else=add
+nl_elseif_brace=remove
+nl_else_brace=remove
+nl_else_if=remove
+nl_for_brace=remove
+nl_while_brace=remove
+nl_do_brace=remove
+nl_switch_brace=remove
+nl_fdef_brace=remove
+nl_class_colon=remove