Mercurial > hg > forks > UniversalIndentGUI
changeset 441:5afe7540135e
Updated to uncrustify version 0.46
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@676 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Thu, 15 May 2008 19:35:55 +0000 |
| parents | e501511d7338 |
| children | 7f49f0e68bca |
| files | indenters/uigui_uncrustify.ini |
| diffstat | 1 files changed, 281 insertions(+), 136 deletions(-) [+] |
line wrap: on
line diff
--- a/indenters/uigui_uncrustify.ini Thu May 15 15:10:22 2008 +0000 +++ b/indenters/uigui_uncrustify.ini Thu May 15 19:35:55 2008 +0000 @@ -10,11 +10,12 @@ manual=http://uncrustify.sourceforge.net/config.txt outputFileName=indentoutput outputFileParameter="-o " +stringparaminquotes=false parameterOrder=ipo showHelpParameter=-h stringparaminquotes=false useCfgFileParameter="-c " -version=0.43 +version=0.46 [newlines] Category=0 @@ -23,7 +24,8 @@ ValueDefault=3 Enabled=false EditorType=multiple -Choices=newlines=lf|newlines=crlf|newlines=cr|newlines=auto +Choices="newlines=lf|newlines=crlf|newlines=cr|newlines=auto" +ChoicesReadable="Newlines Mac|Newlines Win|Newlines Unix|Newlines Auto" [input_tab_size] Category=0 @@ -252,6 +254,15 @@ MinVal=0 MaxVal=16 +[indent_relative_single_line_comments] +Category=1 +Description="<html>If set, will indent trailing single line ('//') comments relative<BR>to the code instead of trying to keep the same absolute column</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=boolean +TrueFalse=indent_relative_single_line_comments=true|indent_relative_single_line_comments=false + [indent_switch_case] Category=1 Description="<html>Spaces to indent 'case' from 'switch'<BR>Usually 0 or indent_columns.</html>" @@ -316,6 +327,15 @@ MinVal=-16 MaxVal=16 +[indent_access_spec_body] +Category=1 +Description="<html>Indent the code after an access specifier by one level.<BR>If set, this option forces 'indent_access_spec=0'</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=boolean +TrueFalse=indent_access_spec_body=true|indent_access_spec_body=false + [indent_paren_nl] Category=1 Description="<html>If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)</html>" @@ -379,7 +399,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_arith=ignore|sp_arith=add|sp_arith=remove|sp_arith=force +Choices="sp_arith=ignore|sp_arith=add|sp_arith=remove|sp_arith=force" [sp_assign] Category=2 @@ -388,7 +408,16 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_assign=ignore|sp_assign=add|sp_assign=remove|sp_assign=force +Choices="sp_assign=ignore|sp_assign=add|sp_assign=remove|sp_assign=force" + +[sp_enum_assign] +Category=2 +Description="<html>Add or remove space around assignment '=' in enum</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=multiple +Choices="sp_enum_assign=ignore|sp_enum_assign=add|sp_enum_assign=remove|sp_enum_assign=force" [sp_bool] Category=2 @@ -397,7 +426,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_bool=ignore|sp_bool=add|sp_bool=remove|sp_bool=force +Choices="sp_bool=ignore|sp_bool=add|sp_bool=remove|sp_bool=force" [sp_compare] Category=2 @@ -406,7 +435,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_compare=ignore|sp_compare=add|sp_compare=remove|sp_compare=force +Choices="sp_compare=ignore|sp_compare=add|sp_compare=remove|sp_compare=force" [sp_inside_paren] Category=2 @@ -415,7 +444,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_paren=ignore|sp_inside_paren=add|sp_inside_paren=remove|sp_inside_paren=force +Choices="sp_inside_paren=ignore|sp_inside_paren=add|sp_inside_paren=remove|sp_inside_paren=force" [sp_paren_paren] Category=2 @@ -424,7 +453,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_paren_paren=ignore|sp_paren_paren=add|sp_paren_paren=remove|sp_paren_paren=force +Choices="sp_paren_paren=ignore|sp_paren_paren=add|sp_paren_paren=remove|sp_paren_paren=force" [sp_balance_nested_parens] Category=2 @@ -442,7 +471,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_paren_brace=ignore|sp_paren_brace=add|sp_paren_brace=remove|sp_paren_brace=force +Choices="sp_paren_brace=ignore|sp_paren_brace=add|sp_paren_brace=remove|sp_paren_brace=force" [sp_before_ptr_star] Category=2 @@ -451,7 +480,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_ptr_star=ignore|sp_before_ptr_star=add|sp_before_ptr_star=remove|sp_before_ptr_star=force +Choices="sp_before_ptr_star=ignore|sp_before_ptr_star=add|sp_before_ptr_star=remove|sp_before_ptr_star=force" [sp_between_ptr_star] Category=2 @@ -460,7 +489,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_between_ptr_star=ignore|sp_between_ptr_star=add|sp_between_ptr_star=remove|sp_between_ptr_star=force +Choices="sp_between_ptr_star=ignore|sp_between_ptr_star=add|sp_between_ptr_star=remove|sp_between_ptr_star=force" [sp_after_ptr_star] Category=2 @@ -469,7 +498,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_ptr_star=ignore|sp_after_ptr_star=add|sp_after_ptr_star=remove|sp_after_ptr_star=force +Choices="sp_after_ptr_star=ignore|sp_after_ptr_star=add|sp_after_ptr_star=remove|sp_after_ptr_star=force" [sp_before_byref] Category=2 @@ -478,7 +507,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_byref=ignore|sp_before_byref=add|sp_before_byref=remove|sp_before_byref=force +Choices="sp_before_byref=ignore|sp_before_byref=add|sp_before_byref=remove|sp_before_byref=force" [sp_after_byref] Category=2 @@ -487,7 +516,16 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force +Choices="sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force" + +[sp_after_type] +Category=2 +Description="<html>Add or remove space between type and word</html>" +Value=3 +ValueDefault=3 +Enabled=false +EditorType=multiple +Choices="sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force" [sp_before_angle] Category=2 @@ -496,7 +534,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force +Choices="sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force" [sp_after_angle] Category=2 @@ -505,7 +543,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force +Choices="sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force" [sp_angle_paren] Category=2 @@ -514,7 +552,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_angle_paren=ignore|sp_angle_paren=add|sp_angle_paren=remove|sp_angle_paren=force +Choices="sp_angle_paren=ignore|sp_angle_paren=add|sp_angle_paren=remove|sp_angle_paren=force" [sp_angle_word] Category=2 @@ -523,7 +561,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force +Choices="sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force" [sp_before_sparen] Category=2 @@ -532,7 +570,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_sparen=ignore|sp_before_sparen=add|sp_before_sparen=remove|sp_before_sparen=force +Choices="sp_before_sparen=ignore|sp_before_sparen=add|sp_before_sparen=remove|sp_before_sparen=force" [sp_inside_sparen] Category=2 @@ -541,7 +579,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_sparen=ignore|sp_inside_sparen=add|sp_inside_sparen=remove|sp_inside_sparen=force +Choices="sp_inside_sparen=ignore|sp_inside_sparen=add|sp_inside_sparen=remove|sp_inside_sparen=force" [sp_after_sparen] Category=2 @@ -550,7 +588,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_sparen=ignore|sp_after_sparen=add|sp_after_sparen=remove|sp_after_sparen=force +Choices="sp_after_sparen=ignore|sp_after_sparen=add|sp_after_sparen=remove|sp_after_sparen=force" [sp_sparen_brace] Category=2 @@ -559,7 +597,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_sparen_brace=ignore|sp_sparen_brace=add|sp_sparen_brace=remove|sp_sparen_brace=force +Choices="sp_sparen_brace=ignore|sp_sparen_brace=add|sp_sparen_brace=remove|sp_sparen_brace=force" [sp_special_semi] Category=2 @@ -568,7 +606,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_special_semi=ignore|sp_special_semi=add|sp_special_semi=remove|sp_special_semi=force +Choices="sp_special_semi=ignore|sp_special_semi=add|sp_special_semi=remove|sp_special_semi=force" [sp_before_semi] Category=2 @@ -577,7 +615,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force +Choices="sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force" [sp_before_semi_for] Category=2 @@ -586,7 +624,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_semi_for=ignore|sp_before_semi_for=add|sp_before_semi_for=remove|sp_before_semi_for=force +Choices="sp_before_semi_for=ignore|sp_before_semi_for=add|sp_before_semi_for=remove|sp_before_semi_for=force" [sp_before_semi_for_empty] Category=2 @@ -595,7 +633,7 @@ ValueDefault=0 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 +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" [sp_after_semi_for_empty] Category=2 @@ -604,7 +642,7 @@ ValueDefault=0 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 +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" [sp_before_square] Category=2 @@ -613,7 +651,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_square=ignore|sp_before_square=add|sp_before_square=remove|sp_before_square=force +Choices="sp_before_square=ignore|sp_before_square=add|sp_before_square=remove|sp_before_square=force" [sp_before_squares] Category=2 @@ -622,7 +660,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_squares=ignore|sp_before_squares=add|sp_before_squares=remove|sp_before_squares=force +Choices="sp_before_squares=ignore|sp_before_squares=add|sp_before_squares=remove|sp_before_squares=force" [sp_inside_square] Category=2 @@ -631,7 +669,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_square=ignore|sp_inside_square=add|sp_inside_square=remove|sp_inside_square=force +Choices="sp_inside_square=ignore|sp_inside_square=add|sp_inside_square=remove|sp_inside_square=force" [sp_after_comma] Category=2 @@ -640,7 +678,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_comma=ignore|sp_after_comma=add|sp_after_comma=remove|sp_after_comma=force +Choices="sp_after_comma=ignore|sp_after_comma=add|sp_after_comma=remove|sp_after_comma=force" [sp_before_comma] Category=2 @@ -649,7 +687,25 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force +Choices="sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force" + +[sp_after_class_colon] +Category=2 +Description="<html>Add or remove space after class ':'</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=multiple +Choices="sp_after_class_colon=ignore|sp_after_class_colon=add|sp_after_class_colon=remove|sp_after_class_colon=force" + +[sp_before_class_colon] +Category=2 +Description="<html>Add or remove space before class ':'</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=multiple +Choices="sp_before_class_colon=ignore|sp_before_class_colon=add|sp_before_class_colon=remove|sp_before_class_colon=force" [sp_after_operator] Category=2 @@ -658,7 +714,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_operator=ignore|sp_after_operator=add|sp_after_operator=remove|sp_after_operator=force +Choices="sp_after_operator=ignore|sp_after_operator=add|sp_after_operator=remove|sp_after_operator=force" [sp_after_cast] Category=2 @@ -667,7 +723,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force +Choices="sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force" [sp_inside_paren_cast] Category=2 @@ -676,7 +732,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_paren_cast=ignore|sp_inside_paren_cast=add|sp_inside_paren_cast=remove|sp_inside_paren_cast=force +Choices="sp_inside_paren_cast=ignore|sp_inside_paren_cast=add|sp_inside_paren_cast=remove|sp_inside_paren_cast=force" [sp_sizeof_paren] Category=2 @@ -685,7 +741,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_sizeof_paren=ignore|sp_sizeof_paren=add|sp_sizeof_paren=remove|sp_sizeof_paren=force +Choices="sp_sizeof_paren=ignore|sp_sizeof_paren=add|sp_sizeof_paren=remove|sp_sizeof_paren=force" [sp_after_tag] Category=2 @@ -694,7 +750,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_tag=ignore|sp_after_tag=add|sp_after_tag=remove|sp_after_tag=force +Choices="sp_after_tag=ignore|sp_after_tag=add|sp_after_tag=remove|sp_after_tag=force" [sp_inside_braces_enum] Category=2 @@ -703,7 +759,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_braces_enum=ignore|sp_inside_braces_enum=add|sp_inside_braces_enum=remove|sp_inside_braces_enum=force +Choices="sp_inside_braces_enum=ignore|sp_inside_braces_enum=add|sp_inside_braces_enum=remove|sp_inside_braces_enum=force" [sp_inside_braces_struct] Category=2 @@ -712,7 +768,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_braces_struct=ignore|sp_inside_braces_struct=add|sp_inside_braces_struct=remove|sp_inside_braces_struct=force +Choices="sp_inside_braces_struct=ignore|sp_inside_braces_struct=add|sp_inside_braces_struct=remove|sp_inside_braces_struct=force" [sp_inside_braces] Category=2 @@ -721,7 +777,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_braces=ignore|sp_inside_braces=add|sp_inside_braces=remove|sp_inside_braces=force +Choices="sp_inside_braces=ignore|sp_inside_braces=add|sp_inside_braces=remove|sp_inside_braces=force" [sp_inside_angle] Category=2 @@ -730,7 +786,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_angle=ignore|sp_inside_angle=add|sp_inside_angle=remove|sp_inside_angle=force +Choices="sp_inside_angle=ignore|sp_inside_angle=add|sp_inside_angle=remove|sp_inside_angle=force" [sp_type_func] Category=2 @@ -739,7 +795,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force +Choices="sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force" [sp_func_proto_paren] Category=2 @@ -748,7 +804,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_func_proto_paren=ignore|sp_func_proto_paren=add|sp_func_proto_paren=remove|sp_func_proto_paren=force +Choices="sp_func_proto_paren=ignore|sp_func_proto_paren=add|sp_func_proto_paren=remove|sp_func_proto_paren=force" [sp_func_def_paren] Category=2 @@ -757,7 +813,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_func_def_paren=ignore|sp_func_def_paren=add|sp_func_def_paren=remove|sp_func_def_paren=force +Choices="sp_func_def_paren=ignore|sp_func_def_paren=add|sp_func_def_paren=remove|sp_func_def_paren=force" [sp_inside_fparens] Category=2 @@ -766,7 +822,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_fparens=ignore|sp_inside_fparens=add|sp_inside_fparens=remove|sp_inside_fparens=force +Choices="sp_inside_fparens=ignore|sp_inside_fparens=add|sp_inside_fparens=remove|sp_inside_fparens=force" [sp_inside_fparen] Category=2 @@ -775,7 +831,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_inside_fparen=ignore|sp_inside_fparen=add|sp_inside_fparen=remove|sp_inside_fparen=force +Choices="sp_inside_fparen=ignore|sp_inside_fparen=add|sp_inside_fparen=remove|sp_inside_fparen=force" [sp_square_fparen] Category=2 @@ -784,7 +840,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_square_fparen=ignore|sp_square_fparen=add|sp_square_fparen=remove|sp_square_fparen=force +Choices="sp_square_fparen=ignore|sp_square_fparen=add|sp_square_fparen=remove|sp_square_fparen=force" [sp_fparen_brace] Category=2 @@ -793,7 +849,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_fparen_brace=ignore|sp_fparen_brace=add|sp_fparen_brace=remove|sp_fparen_brace=force +Choices="sp_fparen_brace=ignore|sp_fparen_brace=add|sp_fparen_brace=remove|sp_fparen_brace=force" [sp_func_call_paren] Category=2 @@ -802,7 +858,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_func_call_paren=ignore|sp_func_call_paren=add|sp_func_call_paren=remove|sp_func_call_paren=force +Choices="sp_func_call_paren=ignore|sp_func_call_paren=add|sp_func_call_paren=remove|sp_func_call_paren=force" [sp_func_class_paren] Category=2 @@ -811,7 +867,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_func_class_paren=ignore|sp_func_class_paren=add|sp_func_class_paren=remove|sp_func_class_paren=force +Choices="sp_func_class_paren=ignore|sp_func_class_paren=add|sp_func_class_paren=remove|sp_func_class_paren=force" [sp_return_paren] Category=2 @@ -820,7 +876,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_return_paren=ignore|sp_return_paren=add|sp_return_paren=remove|sp_return_paren=force +Choices="sp_return_paren=ignore|sp_return_paren=add|sp_return_paren=remove|sp_return_paren=force" [sp_attribute_paren] Category=2 @@ -829,7 +885,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_attribute_paren=ignore|sp_attribute_paren=add|sp_attribute_paren=remove|sp_attribute_paren=force +Choices="sp_attribute_paren=ignore|sp_attribute_paren=add|sp_attribute_paren=remove|sp_attribute_paren=force" [sp_macro] Category=2 @@ -838,7 +894,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force +Choices="sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force" [sp_macro_func] Category=2 @@ -847,7 +903,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_macro_func=ignore|sp_macro_func=add|sp_macro_func=remove|sp_macro_func=force +Choices="sp_macro_func=ignore|sp_macro_func=add|sp_macro_func=remove|sp_macro_func=force" [sp_else_brace] Category=2 @@ -856,7 +912,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_else_brace=ignore|sp_else_brace=add|sp_else_brace=remove|sp_else_brace=force +Choices="sp_else_brace=ignore|sp_else_brace=add|sp_else_brace=remove|sp_else_brace=force" [sp_brace_else] Category=2 @@ -865,7 +921,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_brace_else=ignore|sp_brace_else=add|sp_brace_else=remove|sp_brace_else=force +Choices="sp_brace_else=ignore|sp_brace_else=add|sp_brace_else=remove|sp_brace_else=force" [sp_catch_brace] Category=2 @@ -874,7 +930,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force +Choices="sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force" [sp_brace_catch] Category=2 @@ -883,7 +939,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_brace_catch=ignore|sp_brace_catch=add|sp_brace_catch=remove|sp_brace_catch=force +Choices="sp_brace_catch=ignore|sp_brace_catch=add|sp_brace_catch=remove|sp_brace_catch=force" [sp_finally_brace] Category=2 @@ -892,7 +948,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_finally_brace=ignore|sp_finally_brace=add|sp_finally_brace=remove|sp_finally_brace=force +Choices="sp_finally_brace=ignore|sp_finally_brace=add|sp_finally_brace=remove|sp_finally_brace=force" [sp_brace_finally] Category=2 @@ -901,7 +957,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_brace_finally=ignore|sp_brace_finally=add|sp_brace_finally=remove|sp_brace_finally=force +Choices="sp_brace_finally=ignore|sp_brace_finally=add|sp_brace_finally=remove|sp_brace_finally=force" [sp_try_brace] Category=2 @@ -910,7 +966,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_try_brace=ignore|sp_try_brace=add|sp_try_brace=remove|sp_try_brace=force +Choices="sp_try_brace=ignore|sp_try_brace=add|sp_try_brace=remove|sp_try_brace=force" [sp_getset_brace] Category=2 @@ -919,7 +975,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_getset_brace=ignore|sp_getset_brace=add|sp_getset_brace=remove|sp_getset_brace=force +Choices="sp_getset_brace=ignore|sp_getset_brace=add|sp_getset_brace=remove|sp_getset_brace=force" [sp_before_dc] Category=2 @@ -928,7 +984,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_dc=ignore|sp_before_dc=add|sp_before_dc=remove|sp_before_dc=force +Choices="sp_before_dc=ignore|sp_before_dc=add|sp_before_dc=remove|sp_before_dc=force" [sp_after_dc] Category=2 @@ -937,7 +993,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_dc=ignore|sp_after_dc=add|sp_after_dc=remove|sp_after_dc=force +Choices="sp_after_dc=ignore|sp_after_dc=add|sp_after_dc=remove|sp_after_dc=force" [sp_d_array_colon] Category=2 @@ -946,7 +1002,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_d_array_colon=ignore|sp_d_array_colon=add|sp_d_array_colon=remove|sp_d_array_colon=force +Choices="sp_d_array_colon=ignore|sp_d_array_colon=add|sp_d_array_colon=remove|sp_d_array_colon=force" [sp_not] Category=2 @@ -955,7 +1011,7 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force +Choices="sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force" [sp_inv] Category=2 @@ -964,7 +1020,7 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force +Choices="sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force" [sp_addr] Category=2 @@ -973,7 +1029,7 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force +Choices="sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force" [sp_member] Category=2 @@ -982,7 +1038,7 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force +Choices="sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force" [sp_deref] Category=2 @@ -991,7 +1047,7 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force +Choices="sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force" [sp_sign] Category=2 @@ -1000,7 +1056,7 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force +Choices="sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force" [sp_incdec] Category=2 @@ -1009,7 +1065,7 @@ ValueDefault=2 Enabled=false EditorType=multiple -Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force +Choices="sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force" [sp_after_oc_scope] Category=2 @@ -1018,7 +1074,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_after_oc_scope=ignore|sp_after_oc_scope=add|sp_after_oc_scope=remove|sp_after_oc_scope=force +Choices="sp_after_oc_scope=ignore|sp_after_oc_scope=add|sp_after_oc_scope=remove|sp_after_oc_scope=force" [sp_before_oc_colon] Category=2 @@ -1027,7 +1083,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=sp_before_oc_colon=ignore|sp_before_oc_colon=add|sp_before_oc_colon=remove|sp_before_oc_colon=force +Choices="sp_before_oc_colon=ignore|sp_before_oc_colon=add|sp_before_oc_colon=remove|sp_before_oc_colon=force" [sp_after_oc_type] Category=2 @@ -1036,7 +1092,7 @@ ValueDefault=0 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 +Choices="sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force" [align_keep_tabs] Category=3 @@ -1127,6 +1183,17 @@ MinVal=0 MaxVal=5000 +[align_var_def_gap] +Category=3 +Description="<html>The gap for aligning variable definitions</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=numeric +CallName="align_var_def_gap=" +MinVal=0 +MaxVal=16 + [align_var_def_colon] Category=3 Description="<html>Whether to align the colon in struct bit fields</html>" @@ -1211,6 +1278,17 @@ MinVal=0 MaxVal=5000 +[align_var_struct_gap] +Category=3 +Description="<html>The gap for aligning struct/union member definitions</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=numeric +CallName="align_var_struct_gap=" +MinVal=0 +MaxVal=16 + [align_struct_init_span] Category=3 Description="<html>The span for aligning struct initializer values (0=don't align)</html>" @@ -1308,9 +1386,58 @@ MinVal=0 MaxVal=5000 +[align_func_proto_gap] +Category=3 +Description="<html>Minimum gap between the return type and the function name.</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=numeric +CallName="align_func_proto_gap=" +MinVal=0 +MaxVal=16 + +[align_mix_var_proto] +Category=3 +Description="<html>Whether to mix aligning prototype and variable declarations.<BR>If true, align_var_def_XXX options are used instead of align_func_proto_XXX options.</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=boolean +TrueFalse=align_mix_var_proto=true|align_mix_var_proto=false + +[align_single_line_func] +Category=3 +Description="<html>Align single-line functions with function prototypes, uses align_func_proto_span</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=boolean +TrueFalse=align_single_line_func=true|align_single_line_func=false + +[align_single_line_brace] +Category=3 +Description="<html>Aligning the open brace of single-line functions.<BR>Requires align_single_line_func=true, uses align_func_proto_span</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=boolean +TrueFalse=align_single_line_brace=true|align_single_line_brace=false + +[align_single_line_brace_gap] +Category=3 +Description="<html>Gap for align_single_line_brace.<BR></html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=numeric +CallName="align_single_line_brace_gap=" +MinVal=0 +MaxVal=16 + [align_oc_msg_spec_span] Category=3 -Description="<html>The span for aligning function prototypes (0=don't align)</html>" +Description="<html>The span for aligning ObjC msg spec (0=don't align)</html>" Value=0 ValueDefault=0 Enabled=false @@ -1321,7 +1448,7 @@ [align_nl_cont] Category=3 -Description="<html>Whether to align macros wrapped with a backslash and a newline</html>" +Description="<html>Whether to align macros wrapped with a backslash and a newline.<BR>This will not work right if the macro contains a multi-line comment.</html>" Value=0 ValueDefault=0 Enabled=false @@ -1420,7 +1547,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_start_of_file=ignore|nl_start_of_file=add|nl_start_of_file=remove|nl_start_of_file=force +Choices="nl_start_of_file=ignore|nl_start_of_file=add|nl_start_of_file=remove|nl_start_of_file=force" [nl_start_of_file_min] Category=4 @@ -1440,7 +1567,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_end_of_file=ignore|nl_end_of_file=add|nl_end_of_file=remove|nl_end_of_file=force +Choices="nl_end_of_file=ignore|nl_end_of_file=add|nl_end_of_file=remove|nl_end_of_file=force" [nl_end_of_file_min] Category=4 @@ -1460,7 +1587,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_assign_brace=ignore|nl_assign_brace=add|nl_assign_brace=remove|nl_assign_brace=force +Choices="nl_assign_brace=ignore|nl_assign_brace=add|nl_assign_brace=remove|nl_assign_brace=force" [nl_assign_square] Category=4 @@ -1469,7 +1596,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force +Choices="nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force" [nl_after_square_assign] Category=4 @@ -1478,7 +1605,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_after_square_assign=ignore|nl_after_square_assign=add|nl_after_square_assign=remove|nl_after_square_assign=force +Choices="nl_after_square_assign=ignore|nl_after_square_assign=add|nl_after_square_assign=remove|nl_after_square_assign=force" [nl_func_var_def_blk] Category=4 @@ -1498,7 +1625,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_fcall_brace=ignore|nl_fcall_brace=add|nl_fcall_brace=remove|nl_fcall_brace=force +Choices="nl_fcall_brace=ignore|nl_fcall_brace=add|nl_fcall_brace=remove|nl_fcall_brace=force" [nl_enum_brace] Category=4 @@ -1507,7 +1634,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_enum_brace=ignore|nl_enum_brace=add|nl_enum_brace=remove|nl_enum_brace=force +Choices="nl_enum_brace=ignore|nl_enum_brace=add|nl_enum_brace=remove|nl_enum_brace=force" [nl_struct_brace] Category=4 @@ -1516,7 +1643,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_struct_brace=ignore|nl_struct_brace=add|nl_struct_brace=remove|nl_struct_brace=force +Choices="nl_struct_brace=ignore|nl_struct_brace=add|nl_struct_brace=remove|nl_struct_brace=force" [nl_union_brace] Category=4 @@ -1525,7 +1652,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_union_brace=ignore|nl_union_brace=add|nl_union_brace=remove|nl_union_brace=force +Choices="nl_union_brace=ignore|nl_union_brace=add|nl_union_brace=remove|nl_union_brace=force" [nl_if_brace] Category=4 @@ -1534,7 +1661,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_if_brace=ignore|nl_if_brace=add|nl_if_brace=remove|nl_if_brace=force +Choices="nl_if_brace=ignore|nl_if_brace=add|nl_if_brace=remove|nl_if_brace=force" [nl_brace_else] Category=4 @@ -1543,7 +1670,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_brace_else=ignore|nl_brace_else=add|nl_brace_else=remove|nl_brace_else=force +Choices="nl_brace_else=ignore|nl_brace_else=add|nl_brace_else=remove|nl_brace_else=force" [nl_elseif_brace] Category=4 @@ -1552,7 +1679,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_elseif_brace=ignore|nl_elseif_brace=add|nl_elseif_brace=remove|nl_elseif_brace=force +Choices="nl_elseif_brace=ignore|nl_elseif_brace=add|nl_elseif_brace=remove|nl_elseif_brace=force" [nl_else_brace] Category=4 @@ -1561,7 +1688,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_else_brace=ignore|nl_else_brace=add|nl_else_brace=remove|nl_else_brace=force +Choices="nl_else_brace=ignore|nl_else_brace=add|nl_else_brace=remove|nl_else_brace=force" [nl_brace_finally] Category=4 @@ -1570,7 +1697,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_brace_finally=ignore|nl_brace_finally=add|nl_brace_finally=remove|nl_brace_finally=force +Choices="nl_brace_finally=ignore|nl_brace_finally=add|nl_brace_finally=remove|nl_brace_finally=force" [nl_finally_brace] Category=4 @@ -1579,7 +1706,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_finally_brace=ignore|nl_finally_brace=add|nl_finally_brace=remove|nl_finally_brace=force +Choices="nl_finally_brace=ignore|nl_finally_brace=add|nl_finally_brace=remove|nl_finally_brace=force" [nl_try_brace] Category=4 @@ -1588,7 +1715,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_try_brace=ignore|nl_try_brace=add|nl_try_brace=remove|nl_try_brace=force +Choices="nl_try_brace=ignore|nl_try_brace=add|nl_try_brace=remove|nl_try_brace=force" [nl_getset_brace] Category=4 @@ -1597,7 +1724,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_getset_brace=ignore|nl_getset_brace=add|nl_getset_brace=remove|nl_getset_brace=force +Choices="nl_getset_brace=ignore|nl_getset_brace=add|nl_getset_brace=remove|nl_getset_brace=force" [nl_for_brace] Category=4 @@ -1606,7 +1733,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_for_brace=ignore|nl_for_brace=add|nl_for_brace=remove|nl_for_brace=force +Choices="nl_for_brace=ignore|nl_for_brace=add|nl_for_brace=remove|nl_for_brace=force" [nl_catch_brace] Category=4 @@ -1615,7 +1742,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force +Choices="nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force" [nl_brace_catch] Category=4 @@ -1624,7 +1751,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_brace_catch=ignore|nl_brace_catch=add|nl_brace_catch=remove|nl_brace_catch=force +Choices="nl_brace_catch=ignore|nl_brace_catch=add|nl_brace_catch=remove|nl_brace_catch=force" [nl_while_brace] Category=4 @@ -1633,7 +1760,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_while_brace=ignore|nl_while_brace=add|nl_while_brace=remove|nl_while_brace=force +Choices="nl_while_brace=ignore|nl_while_brace=add|nl_while_brace=remove|nl_while_brace=force" [nl_do_brace] Category=4 @@ -1642,7 +1769,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_do_brace=ignore|nl_do_brace=add|nl_do_brace=remove|nl_do_brace=force +Choices="nl_do_brace=ignore|nl_do_brace=add|nl_do_brace=remove|nl_do_brace=force" [nl_brace_while] Category=4 @@ -1651,7 +1778,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_brace_while=ignore|nl_brace_while=add|nl_brace_while=remove|nl_brace_while=force +Choices="nl_brace_while=ignore|nl_brace_while=add|nl_brace_while=remove|nl_brace_while=force" [nl_switch_brace] Category=4 @@ -1660,7 +1787,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_switch_brace=ignore|nl_switch_brace=add|nl_switch_brace=remove|nl_switch_brace=force +Choices="nl_switch_brace=ignore|nl_switch_brace=add|nl_switch_brace=remove|nl_switch_brace=force" [nl_multi_line_cond] Category=4 @@ -1671,6 +1798,15 @@ EditorType=boolean TrueFalse=nl_multi_line_cond=true|nl_multi_line_cond=false +[nl_multi_line_define] +Category=4 +Description="<html>Force a newline in a define after the macro name for multi-line defines.</html>" +Value=0 +ValueDefault=0 +Enabled=false +EditorType=boolean +TrueFalse=nl_multi_line_define=true|nl_multi_line_define=false + [nl_before_case] Category=4 Description="<html>Whether to put a newline before 'case' statement</html>" @@ -1696,7 +1832,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_namespace_brace=ignore|nl_namespace_brace=add|nl_namespace_brace=remove|nl_namespace_brace=force +Choices="nl_namespace_brace=ignore|nl_namespace_brace=add|nl_namespace_brace=remove|nl_namespace_brace=force" [nl_template_class] Category=4 @@ -1705,7 +1841,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_template_class=ignore|nl_template_class=add|nl_template_class=remove|nl_template_class=force +Choices="nl_template_class=ignore|nl_template_class=add|nl_template_class=remove|nl_template_class=force" [nl_class_brace] Category=4 @@ -1714,7 +1850,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_class_brace=ignore|nl_class_brace=add|nl_class_brace=remove|nl_class_brace=force +Choices="nl_class_brace=ignore|nl_class_brace=add|nl_class_brace=remove|nl_class_brace=force" [nl_class_init_args] Category=4 @@ -1723,7 +1859,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_class_init_args=ignore|nl_class_init_args=add|nl_class_init_args=remove|nl_class_init_args=force +Choices="nl_class_init_args=ignore|nl_class_init_args=add|nl_class_init_args=remove|nl_class_init_args=force" [nl_func_type_name] Category=4 @@ -1732,7 +1868,7 @@ ValueDefault=0 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 +Choices="nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force" [nl_func_proto_type_name] Category=4 @@ -1741,7 +1877,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_func_proto_type_name=ignore|nl_func_proto_type_name=add|nl_func_proto_type_name=remove|nl_func_proto_type_name=force +Choices="nl_func_proto_type_name=ignore|nl_func_proto_type_name=add|nl_func_proto_type_name=remove|nl_func_proto_type_name=force" [nl_func_paren] Category=4 @@ -1750,7 +1886,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force +Choices="nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force" [nl_func_decl_start] Category=4 @@ -1759,7 +1895,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_func_decl_start=ignore|nl_func_decl_start=add|nl_func_decl_start=remove|nl_func_decl_start=force +Choices="nl_func_decl_start=ignore|nl_func_decl_start=add|nl_func_decl_start=remove|nl_func_decl_start=force" [nl_func_decl_args] Category=4 @@ -1768,7 +1904,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_func_decl_args=ignore|nl_func_decl_args=add|nl_func_decl_args=remove|nl_func_decl_args=force +Choices="nl_func_decl_args=ignore|nl_func_decl_args=add|nl_func_decl_args=remove|nl_func_decl_args=force" [nl_func_decl_end] Category=4 @@ -1777,7 +1913,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_func_decl_end=ignore|nl_func_decl_end=add|nl_func_decl_end=remove|nl_func_decl_end=force +Choices="nl_func_decl_end=ignore|nl_func_decl_end=add|nl_func_decl_end=remove|nl_func_decl_end=force" [nl_fdef_brace] Category=4 @@ -1786,7 +1922,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_fdef_brace=ignore|nl_fdef_brace=add|nl_fdef_brace=remove|nl_fdef_brace=force +Choices="nl_fdef_brace=ignore|nl_fdef_brace=add|nl_fdef_brace=remove|nl_fdef_brace=force" [nl_after_return] Category=4 @@ -1858,7 +1994,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force +Choices="nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force" [nl_after_if] Category=4 @@ -1867,7 +2003,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force +Choices="nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force" [nl_before_for] Category=4 @@ -1876,7 +2012,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force +Choices="nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force" [nl_after_for] Category=4 @@ -1885,7 +2021,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force +Choices="nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force" [nl_before_while] Category=4 @@ -1894,7 +2030,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force +Choices="nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force" [nl_after_while] Category=4 @@ -1903,7 +2039,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force +Choices="nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force" [nl_before_switch] Category=4 @@ -1912,7 +2048,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force +Choices="nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force" [nl_after_switch] Category=4 @@ -1921,7 +2057,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force +Choices="nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force" [nl_before_do] Category=4 @@ -1930,7 +2066,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force +Choices="nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force" [nl_after_do] Category=4 @@ -1939,7 +2075,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force +Choices="nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force" [nl_ds_struct_enum_cmt] Category=4 @@ -1966,7 +2102,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force +Choices="nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force" [nl_create_if_one_liner] Category=4 @@ -2002,7 +2138,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=pos_bool=ignore|pos_bool=lead|pos_bool=trail +Choices="pos_bool=ignore|pos_bool=lead|pos_bool=trail" [pos_comma] Category=5 @@ -2011,7 +2147,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=pos_comma=ignore|pos_comma=lead|pos_comma=trail +Choices="pos_comma=ignore|pos_comma=lead|pos_comma=trail" [pos_class_comma] Category=5 @@ -2020,7 +2156,7 @@ ValueDefault=0 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=trail" [pos_class_colon] Category=5 @@ -2029,7 +2165,7 @@ ValueDefault=0 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=trail" [code_width] Category=6 @@ -2204,7 +2340,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=mod_full_brace_do=ignore|mod_full_brace_do=add|mod_full_brace_do=remove|mod_full_brace_do=force +Choices="mod_full_brace_do=ignore|mod_full_brace_do=add|mod_full_brace_do=remove|mod_full_brace_do=force" [mod_full_brace_for] Category=8 @@ -2213,7 +2349,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=mod_full_brace_for=ignore|mod_full_brace_for=add|mod_full_brace_for=remove|mod_full_brace_for=force +Choices="mod_full_brace_for=ignore|mod_full_brace_for=add|mod_full_brace_for=remove|mod_full_brace_for=force" [mod_full_brace_function] Category=8 @@ -2222,7 +2358,7 @@ ValueDefault=0 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 +Choices="mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force" [mod_full_brace_if] Category=8 @@ -2231,7 +2367,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=mod_full_brace_if=ignore|mod_full_brace_if=add|mod_full_brace_if=remove|mod_full_brace_if=force +Choices="mod_full_brace_if=ignore|mod_full_brace_if=add|mod_full_brace_if=remove|mod_full_brace_if=force" [mod_full_brace_nl] Category=8 @@ -2251,7 +2387,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=mod_full_brace_while=ignore|mod_full_brace_while=add|mod_full_brace_while=remove|mod_full_brace_while=force +Choices="mod_full_brace_while=ignore|mod_full_brace_while=add|mod_full_brace_while=remove|mod_full_brace_while=force" [mod_paren_on_return] Category=8 @@ -2260,7 +2396,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=mod_paren_on_return=ignore|mod_paren_on_return=add|mod_paren_on_return=remove|mod_paren_on_return=force +Choices="mod_paren_on_return=ignore|mod_paren_on_return=add|mod_paren_on_return=remove|mod_paren_on_return=force" [mod_pawn_semicolon] Category=8 @@ -2340,7 +2476,7 @@ [cmt_width] Category=9 -Description="<html>Try to wrap comments at cmt_witdth columns</html>" +Description="<html>Try to wrap comments at cmt_width columns</html>" Value=0 ValueDefault=0 Enabled=false @@ -2349,6 +2485,15 @@ MinVal=16 MaxVal=256 +[cmt_indent_multi] +Category=9 +Description="<html>Whether to mess with the indent of multi-line comments</html>" +Value=1 +ValueDefault=1 +Enabled=false +EditorType=boolean +TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false + [cmt_c_group] Category=9 Description="<html>Whether to group c-comments that look like they are in a block</html>" @@ -2471,7 +2616,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force +Choices="pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force" [pp_indent_at_level] Category=10 @@ -2489,7 +2634,7 @@ ValueDefault=0 Enabled=false EditorType=multiple -Choices=pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force +Choices="pp_space=ignore|pp_space=add|pp_space=remove|pp_space=force" [pp_space_count] Category=10