Mercurial > hg > forks > UniversalIndentGUI

changeset 169:c3820d2a93cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added version or file changed date to the indenter name. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@372 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Sun, 03 Jun 2007 11:20:02 +0000
parents 7bab80c4f5c2
children 698b68a910f9
files data/uigui_astyle.ini data/uigui_csstidy.ini data/uigui_gnuindent.ini data/uigui_greatcode.ini data/uigui_phpCB.ini data/uigui_uncrustify.ini
diffstat 6 files changed, 556 insertions(+), 188 deletions(-) [+]
line wrap: on
line diff
--- a/data/uigui_astyle.ini	Sun Jun 03 10:33:01 2007 +0000
+++ b/data/uigui_astyle.ini	Sun Jun 03 11:20:02 2007 +0000
@@ -4,7 +4,7 @@
 configFilename=.astylerc
 fileTypes=*.cpp|*.c|*.h|*.hpp|*.cs|*.java
 indenterFileName=astyle
-indenterName=Artistic Style
+indenterName=Artistic Style 1.20.1
 inputFileName=indentinput
 inputFileParameter=
 outputFileName=indentinput
--- a/data/uigui_csstidy.ini	Sun Jun 03 10:33:01 2007 +0000
+++ b/data/uigui_csstidy.ini	Sun Jun 03 11:20:02 2007 +0000
@@ -4,7 +4,7 @@
 configFilename=
 fileTypes=*.css
 indenterFileName=csstidy
-indenterName=CSSTidy
+indenterName=CSSTidy 2006-05-18
 inputFileName=indentinput
 inputFileParameter=
 outputFileName=indentoutput
--- a/data/uigui_gnuindent.ini	Sun Jun 03 10:33:01 2007 +0000
+++ b/data/uigui_gnuindent.ini	Sun Jun 03 11:20:02 2007 +0000
@@ -4,7 +4,7 @@
 configFilename=.indent.pro
 fileTypes=*.c|*.h
 indenterFileName=indent
-indenterName=GNU Indent
+indenterName=GNU Indent 2.2.9
 inputFileName=indentinput
 inputFileParameter=
 outputFileName=indentoutput
--- a/data/uigui_greatcode.ini	Sun Jun 03 10:33:01 2007 +0000
+++ b/data/uigui_greatcode.ini	Sun Jun 03 11:20:02 2007 +0000
@@ -4,7 +4,7 @@
 configFilename=gc.cfg
 fileTypes=*.cpp|*.c|*.h|*.hpp
 indenterFileName=gc
-indenterName=GreatCode
+indenterName=GreatCode 1.140
 inputFileName=indentinput
 inputFileParameter=-file-
 outputFileName=indentinput
--- a/data/uigui_phpCB.ini	Sun Jun 03 10:33:01 2007 +0000
+++ b/data/uigui_phpCB.ini	Sun Jun 03 11:20:02 2007 +0000
@@ -4,7 +4,7 @@
 configFilename=
 fileTypes=*.php|*.htm|*.html|*.xhtml
 indenterFileName=phpCB
-indenterName=PHP Code Beautifier
+indenterName=PHP Code Beautifier 2007-02-21
 inputFileName=indentinput
 inputFileParameter=
 outputFileName=
--- a/data/uigui_uncrustify.ini	Sun Jun 03 10:33:01 2007 +0000
+++ b/data/uigui_uncrustify.ini	Sun Jun 03 11:20:02 2007 +0000
@@ -1,10 +1,10 @@
 [%20header]
-categories=General|Indenting|Spacing|Code alignment|Newline adding and removing|Positioning|Blank line|Code modifying (non-whitespace)|Comments|Preprocessor
+categories=General options|Indenting|Spacing options|Code alignment (not left column spaces/tabs)|Newline adding and removing options|Positioning options|Blank line options|Code modifying options (non-whitespace)|Comment modifications|Preprocessor options
 cfgFileParameterEnding=cr
 configFilename=uncrustify.cfg
-fileTypes=*.cpp|*.c|*.h|*.hpp|*.cs|*.d|*.java|*.pawn
+fileTypes=*.c|*.cpp|*.d|*.cs|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.di|*.m|*.sqc
 indenterFileName=uncrustify
-indenterName=Uncrustify
+indenterName=Uncrustify 0.34
 inputFileName=indentinput
 inputFileParameter="-f "
 outputFileName=indentoutput
@@ -19,7 +19,7 @@
 Description="<html>The span for aligning on '=' in assignments (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -30,7 +30,7 @@
 Description="<html>The threshold for aligning on '=' in assignments (0=no limit)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -41,7 +41,7 @@
 Description="<html>The span for aligning on '=' in enums (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -52,18 +52,27 @@
 Description="<html>The threshold for aligning on '=' in enums (0=no limit)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
 
+[align_func_params]
+Category=3
+Description=<html>Align variable definitions in prototypes and functions</html>
+EditorType=boolean
+Enabled=false
+TrueFalse="align_func_params=true|align_func_params=false"
+Value=0
+ValueDefault=0
+
 [align_func_proto_span]
 CallName="align_func_proto_span="
 Category=3
 Description="<html>The span for aligning function prototypes (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -72,14 +81,25 @@
 Category=3
 Description=<html>Whether to keep non-indenting tabs</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="align_keep_tabs=true|align_keep_tabs=false"
 Value=0
 ValueDefault=0
 
+[align_nl_cont]
+Category=3
+Description=<html>Whether to align macros wrapped with a backslash and a newline</html>
+EditorType=boolean
+Enabled=false
+TrueFalse="align_nl_cont=true|align_nl_cont=false"
+Value=0
+ValueDefault=0
+
 [align_number_left]
 Category=3
 Description=<html>Whether to left-align numbers</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="align_number_left=true|align_number_left=false"
 Value=0
 ValueDefault=0
@@ -88,6 +108,7 @@
 Category=3
 Description=<html>Whether to bump out to the next tab when aligning</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="align_on_tabstop=true|align_on_tabstop=false"
 Value=0
 ValueDefault=0
@@ -98,7 +119,7 @@
 Description=<html>The minimum space between label and value of a preprocessor define</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -109,7 +130,7 @@
 Description="<html>The span for aligning on '#define' bodies (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -120,7 +141,7 @@
 Description="<html>The span for aligning comments that end lines (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -131,7 +152,7 @@
 Description="<html>The span for aligning struct initializer values (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -142,7 +163,7 @@
 Description=<html>The minimum space between the type and the synonym of a typedef</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -153,7 +174,7 @@
 Description="<html>The span for aligning single-line typedefs (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -161,10 +182,10 @@
 [align_typedef_star_style]
 CallName="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: typedef int *  pint;</html>"
+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>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=2
 MinVal=0
 Value=0
 ValueDefault=0
@@ -173,6 +194,7 @@
 Category=3
 Description=<html>Whether to align the colon in struct bit fields</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="align_var_def_colon=true|align_var_def_colon=false"
 Value=0
 ValueDefault=0
@@ -181,6 +203,7 @@
 Category=3
 Description=<html>Whether to align inline struct/enum/union variable definitions</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="align_var_def_inline=true|align_var_def_inline=false"
 Value=0
 ValueDefault=0
@@ -191,16 +214,19 @@
 Description="<html>The span for aligning variable definitions (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
 
-[align_var_def_star]
+[align_var_def_star_style]
+CallName="align_var_def_star_style="
 Category=3
-Description=<html>Whether the pointer star is part of the variable name or not</html>
-EditorType=boolean
-TrueFalse="align_var_def_star=true|align_var_def_star=false"
+Description="<html>How to align the star in variable definitions.<BR> 0=Part of the type<BR> 1=Part of the variable<BR> 2=Dangling</html>"
+EditorType=numeric
+Enabled=false
+MaxVal=2
+MinVal=0
 Value=0
 ValueDefault=0
 
@@ -210,7 +236,7 @@
 Description="<html>The threshold for aligning variable definitions (0=no limit)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -221,7 +247,7 @@
 Description="<html>The span for aligning struct/union (0=don't align)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -230,6 +256,7 @@
 Category=3
 Description=<html>Whether to use tabs for alinging</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="align_with_tabs=true|align_with_tabs=false"
 Value=0
 ValueDefault=0
@@ -238,6 +265,7 @@
 Category=8
 Description=<html>Whether to group cpp-comments that look like they are in a block</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="cmt_cpp_group=true|cmt_cpp_group=false"
 Value=0
 ValueDefault=0
@@ -246,6 +274,7 @@
 Category=8
 Description=<html>Whether to put a newline before the closing '*/' of the combined cpp-comment</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="cmt_cpp_nl_end=true|cmt_cpp_nl_end=false"
 Value=0
 ValueDefault=0
@@ -254,6 +283,7 @@
 Category=8
 Description=<html>Whether to put an empty '/*' on the first line of the combined cpp-comment</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="cmt_cpp_nl_start=true|cmt_cpp_nl_start=false"
 Value=0
 ValueDefault=0
@@ -262,14 +292,38 @@
 Category=8
 Description=<html>Whether to change cpp-comments into c-comments</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="cmt_cpp_to_c=true|cmt_cpp_to_c=false"
 Value=0
 ValueDefault=0
 
+[cmt_sp_after_star_cont]
+CallName="cmt_sp_after_star_cont="
+Category=8
+Description=<html>The number of spaces to insert after the star on subsequent comment lines</html>
+EditorType=numeric
+Enabled=false
+MaxVal=16
+MinVal=0
+Value=0
+ValueDefault=0
+
+[cmt_sp_before_star_cont]
+CallName="cmt_sp_before_star_cont="
+Category=8
+Description=<html>The number of spaces to insert at the start of subsequent comment lines</html>
+EditorType=numeric
+Enabled=false
+MaxVal=16
+MinVal=0
+Value=0
+ValueDefault=0
+
 [cmt_star_cont]
 Category=8
 Description=<html>Whether to put a star on subsequent comment lines</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="cmt_star_cont=true|cmt_star_cont=false"
 Value=0
 ValueDefault=0
@@ -280,15 +334,16 @@
 Description=<html>Try to limit code width to N number of columns</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
-MinVal=0
-Value=0
+MaxVal=256
+MinVal=16
+Value=16
 ValueDefault=0
 
 [eat_blanks_after_open_brace]
 Category=6
 Description=<html>Whether to remove blank lines after '{'</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="eat_blanks_after_open_brace=true|eat_blanks_after_open_brace=false"
 Value=0
 ValueDefault=0
@@ -297,14 +352,27 @@
 Category=6
 Description=<html>Whether to remove blank lines before '}'</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="eat_blanks_before_close_brace=true|eat_blanks_before_close_brace=false"
 Value=0
 ValueDefault=0
 
+[indent_access_spec]
+CallName="indent_access_spec="
+Category=1
+Description="<html>Same as indent_label, but for access specifiers that are followed by a colon</html>"
+EditorType=numeric
+Enabled=false
+MaxVal=16
+MinVal=-16
+Value=1
+ValueDefault=1
+
 [indent_align_string]
 Category=1
 Description=<html>Whether to indent strings broken by '' so that they line up</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_align_string=true|indent_align_string=false"
 Value=0
 ValueDefault=0
@@ -314,16 +382,17 @@
 Category=1
 Description=<html>Spaces to indent '{' from level</html>
 EditorType=numeric
-Enabled=true
-MaxVal=99
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
 
 [indent_brace_parent]
 Category=1
-Description="<html>Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc.</html>"
+Description="<html>Indent based on the size of the brace parent, ie 'if' =&gt; 3 spaces, 'for' =&gt; 4 spaces, etc.</html>"
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_brace_parent=true|indent_brace_parent=false"
 Value=0
 ValueDefault=0
@@ -332,6 +401,7 @@
 Category=1
 Description=<html>Whether braces are indented to the body level</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_braces=true|indent_braces=false"
 Value=0
 ValueDefault=0
@@ -340,28 +410,29 @@
 Category=1
 Description=<html>Disabled indenting function braces if indent_braces is true</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_braces_no_func=true|indent_braces_no_func=false"
 Value=0
 ValueDefault=0
 
-[indent_case_body]
-CallName="indent_case_body="
-Category=1
-Description=<html>Spaces to indent 'case' body from 'case'</html>
-EditorType=numeric
-Enabled=true
-MaxVal=99
-MinVal=0
-Value=0
-ValueDefault=0
-
 [indent_case_brace]
 CallName="indent_case_brace="
 Category=1
-Description=<html>Spaces to indent '{' from 'case'</html>
+Description="<html>Spaces to indent '{' from 'case'.<BR>By default, the brace will appear under the 'c' in case.<BR>Usually set to 0 or indent_columns.</html>"
 EditorType=numeric
-Enabled=true
-MaxVal=99
+Enabled=false
+MaxVal=16
+MinVal=0
+Value=0
+ValueDefault=0
+
+[indent_case_shift]
+CallName="indent_case_shift="
+Category=1
+Description="<html>Spaces to shift the 'case' line, without affecting any other lines<BR>Usually 0.</html>"
+EditorType=numeric
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -370,6 +441,7 @@
 Category=1
 Description=<html>Whether the 'class' body is indented</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_class=true|indent_class=false"
 Value=0
 ValueDefault=0
@@ -378,6 +450,7 @@
 Category=1
 Description=<html>Whether to indent the stuff after a leading class colon</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_class_colon=true|indent_class_colon=false"
 Value=0
 ValueDefault=0
@@ -386,6 +459,7 @@
 Category=1
 Description=<html>Whether to indent comments found in first column</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_col1_comment=true|indent_col1_comment=false"
 Value=0
 ValueDefault=0
@@ -393,10 +467,10 @@
 [indent_columns]
 CallName="indent_columns="
 Category=1
-Description="<html>The number of columns to indent per level (usually 2, 3, 4, or 8)</html>"
+Description="<html>The number of columns to indent per level.<BR>Usually 2, 3, 4, or 8.</html>"
 EditorType=numeric
-Enabled=true
-MaxVal=300
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=4
 ValueDefault=8
@@ -405,6 +479,7 @@
 Category=1
 Description=<html>Whether to indent continued function call parameters one indent level (true) or aligns instead of indent (false)</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_func_call_param=true|indent_func_call_param=false"
 Value=0
 ValueDefault=0
@@ -412,21 +487,21 @@
 [indent_label]
 CallName="indent_label="
 Category=1
-Description=<html>Spaces to indent '{' from level</html>
+Description="<html>How to indent goto labels<BR> &gt;0 : absolute column where 1 is the leftmost column<BR> &lt;=0 : subtract from brace indent</html>"
 EditorType=numeric
-Enabled=true
-MaxVal=99
-MinVal=-99
+Enabled=false
+MaxVal=16
+MinVal=-16
 Value=1
 ValueDefault=1
 
 [indent_member]
 CallName="indent_member="
 Category=1
-Description=<html>The number of spaces to indent a continued '->' or '.'. Usually set to indent_columns.</html>
+Description="<html>The number of spaces to indent a continued '-&gt;' or '.'<BR>Usually set to 0, 1, or indent_columns.</html>"
 EditorType=numeric
-Enabled=true
-MaxVal=99
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -435,6 +510,7 @@
 Category=1
 Description=<html>Whether the 'namespace' body is indented</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_namespace=true|indent_namespace=false"
 Value=0
 ValueDefault=0
@@ -443,6 +519,7 @@
 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>"
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_paren_nl=true|indent_paren_nl=false"
 Value=0
 ValueDefault=0
@@ -452,8 +529,8 @@
 Category=1
 Description=<html>Spaces to indent single line ('//') comments on lines before code</html>
 EditorType=numeric
-Enabled=true
-MaxVal=99
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -462,6 +539,7 @@
 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>"
 EditorType=boolean
+Enabled=false
 TrueFalse="indent_square_nl=true|indent_square_nl=false"
 Value=0
 ValueDefault=0
@@ -469,10 +547,10 @@
 [indent_switch_case]
 CallName="indent_switch_case="
 Category=1
-Description=<html>Spaces to indent 'case' from 'switch'</html>
+Description=<html>Spaces to indent 'case' from 'switch'<BR>Usually 0 or indent_columns.</html>
 EditorType=numeric
-Enabled=true
-MaxVal=99
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -480,25 +558,54 @@
 [indent_with_tabs]
 CallName="indent_with_tabs="
 Category=1
-Description="<html>How to use tabs when indenting code. <br>0=spaces only, <br>1=indent with tabs, <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, align with spaces<BR>2=indent and align with tabs</html>"
 EditorType=numeric
-Enabled=true
+Enabled=false
 MaxVal=2
 MinVal=0
 Value=0
 ValueDefault=1
 
+[indent_xml_string]
+CallName="indent_xml_string="
+Category=1
+Description="<html>The number of spaces to indent multi-line XML strings.<BR>Requires indent_align_string=True</html>"
+EditorType=numeric
+Enabled=false
+MaxVal=16
+MinVal=0
+Value=0
+ValueDefault=0
+
 [input_tab_size]
 CallName="input_tab_size="
 Category=0
 Description=<html>The original size of tabs in the input</html>
 EditorType=numeric
 Enabled=true
-MaxVal=99
-MinVal=0
+MaxVal=32
+MinVal=1
 Value=4
 ValueDefault=8
 
+[ls_for_split_full]
+Category=5
+Description=<html>Whether to fully split long 'for' statements at semi-colons</html>
+EditorType=boolean
+Enabled=false
+TrueFalse="ls_for_split_full=true|ls_for_split_full=false"
+Value=0
+ValueDefault=0
+
+[ls_func_split_full]
+Category=5
+Description=<html>Whether to fully split long function protos/calls at commas</html>
+EditorType=boolean
+Enabled=false
+TrueFalse="ls_func_split_full=true|ls_func_split_full=false"
+Value=0
+ValueDefault=0
+
 [mod_full_brace_do]
 Category=7
 Choices="mod_full_brace_do=ignore|mod_full_brace_do=add|mod_full_brace_do=remove|mod_full_brace_do=force"
@@ -506,7 +613,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [mod_full_brace_for]
 Category=7
@@ -515,7 +622,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [mod_full_brace_function]
 Category=7
@@ -524,7 +631,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [mod_full_brace_if]
 Category=7
@@ -533,7 +640,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [mod_full_brace_nl]
 CallName="mod_full_brace_nl="
@@ -541,7 +648,7 @@
 Description=<html>Don't remove braces around statements that span N newlines</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=5000
 MinVal=0
 Value=0
 ValueDefault=0
@@ -553,7 +660,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[mod_full_paren_if_bool]
+Category=7
+Description=<html>Add parens on 'while' and 'if' statement around bools</html>
+EditorType=boolean
+Enabled=false
+TrueFalse="mod_full_paren_if_bool=true|mod_full_paren_if_bool=false"
+Value=0
+ValueDefault=0
 
 [mod_paren_on_return]
 Category=7
@@ -562,29 +678,31 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [mod_pawn_semicolon]
 Category=7
 Description=<html>Whether to change optional semicolons to real semicolons</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="mod_pawn_semicolon=true|mod_pawn_semicolon=false"
 Value=0
 ValueDefault=0
 
 [newlines]
 Category=0
-Choices="newlines=auto|newlines=lf|newlines=crlf|newlines=cr"
+Choices="newlines=lf|newlines=crlf|newlines=cr|newlines=auto"
 Description=<html>The type of line endings</html>
 EditorType=multiple
 Enabled=false
-Value=1
-ValueDefault=-1
+Value=3
+ValueDefault=3
 
 [nl_after_brace_open]
 Category=4
 Description=<html>Whether to put a newline after brace open</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_after_brace_open=true|nl_after_brace_open=false"
 Value=0
 ValueDefault=0
@@ -593,6 +711,7 @@
 Category=4
 Description=<html>Whether to put a newline after 'case' statement</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_after_case=true|nl_after_case=false"
 Value=0
 ValueDefault=0
@@ -604,7 +723,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_after_for]
 Category=4
@@ -613,15 +732,26 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_after_func_body]
 CallName="nl_after_func_body="
 Category=6
-Description=<html>The number of newlines after '}' of the function body</html>
+Description=<html>The number of newlines after '}' of a multi-line function body</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
+MinVal=0
+Value=0
+ValueDefault=0
+
+[nl_after_func_body_one_liner]
+CallName="nl_after_func_body_one_liner="
+Category=6
+Description=<html>The number of newlines after '}' of a single line function body</html>
+EditorType=numeric
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -632,7 +762,7 @@
 Description="<html>The number of newlines after a function prototype, if followed by another function prototype</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -643,7 +773,7 @@
 Description="<html>The number of newlines after a function prototype, if not followed by another function prototype</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -655,12 +785,13 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_after_return]
 Category=4
 Description=<html>Whether to put a newline after 'return' statement</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_after_return=true|nl_after_return=false"
 Value=0
 ValueDefault=0
@@ -669,6 +800,7 @@
 Category=4
 Description="<html>Whether to put a newline after semicolons, except in 'for' statements</html>"
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_after_semicolon=true|nl_after_semicolon=false"
 Value=0
 ValueDefault=0
@@ -680,7 +812,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_after_while]
 Category=4
@@ -689,7 +821,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_assign_brace]
 Category=4
@@ -698,15 +830,35 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[nl_assign_leave_one_liners]
+Category=4
+Description="<html>Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };'</html>"
+EditorType=boolean
+Enabled=false
+TrueFalse="nl_assign_leave_one_liners=true|nl_assign_leave_one_liners=false"
+Value=0
+ValueDefault=0
 
 [nl_before_block_comment]
 CallName="nl_before_block_comment="
 Category=6
-Description=<html>The minimum number of newlines before a multi-line comment (doesn't apply if after a brace open)</html>
+Description=<html>The minimum number of newlines before a multi-line comment.<BR>Doesn't apply if after a brace open or another multi-line comment.</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
+MinVal=0
+Value=0
+ValueDefault=0
+
+[nl_before_c_comment]
+CallName="nl_before_c_comment="
+Category=6
+Description=<html>The minimum number of newlines before a single-line C comment.<BR>Doesn't apply if after a brace open or other single-line C comments.</html>
+EditorType=numeric
+Enabled=false
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -715,18 +867,30 @@
 Category=4
 Description=<html>Whether to put a newline before 'case' statement</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_before_case=true|nl_before_case=false"
 Value=0
 ValueDefault=0
 
+[nl_before_cpp_comment]
+CallName="nl_before_cpp_comment="
+Category=6
+Description=<html>The minimum number of newlines before a CPP comment.<BR>Doesn't apply if after a brace open or other CPP comments.</html>
+EditorType=numeric
+Enabled=false
+MaxVal=16
+MinVal=0
+Value=0
+ValueDefault=0
+
 [nl_before_do]
 Category=4
 Choices="nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force"
-Description=<html>dd or remove newline before 'do'</html>
+Description=<html>Add or remove newline before 'do'</html>
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_before_for]
 Category=4
@@ -735,7 +899,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_before_if]
 Category=4
@@ -744,7 +908,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_before_switch]
 Category=4
@@ -753,7 +917,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_before_while]
 Category=4
@@ -762,7 +926,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[nl_brace_catch]
+Category=4
+Choices="nl_brace_catch=ignore|nl_brace_catch=add|nl_brace_catch=remove|nl_brace_catch=force"
+Description=<html>Add or remove newline between '}' and 'catch'</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [nl_brace_else]
 Category=4
@@ -771,7 +944,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[nl_brace_finally]
+Category=4
+Choices="nl_brace_finally=ignore|nl_brace_finally=add|nl_brace_finally=remove|nl_brace_finally=force"
+Description=<html>Add or remove newline between '}' and 'finally'</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [nl_brace_while]
 Category=4
@@ -780,7 +962,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[nl_catch_brace]
+Category=4
+Choices="nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force"
+Description=<html>Add or remove newline between 'catch' and '{'</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [nl_class_brace]
 Category=4
@@ -789,7 +980,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_class_init_args]
 Category=4
@@ -798,12 +989,13 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_class_leave_one_liners]
 Category=4
 Description=<html>Don't touch one-line function bodies inside a class xx { } body</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_class_leave_one_liners=true|nl_class_leave_one_liners=false"
 Value=0
 ValueDefault=0
@@ -812,6 +1004,7 @@
 Category=4
 Description=<html>Whether to collapse empty blocks between '{' and '}'</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_collapse_empty_body=true|nl_collapse_empty_body=false"
 Value=0
 ValueDefault=0
@@ -820,6 +1013,7 @@
 Category=4
 Description=<html>Whether to alter newlines in '#define' macros</html>
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_define_macro=true|nl_define_macro=false"
 Value=0
 ValueDefault=0
@@ -831,7 +1025,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[nl_ds_struct_enum_cmt]
+Category=4
+Description=<html>Whether to double-space commented-entries in struct/enum</html>
+EditorType=boolean
+Enabled=false
+TrueFalse="nl_ds_struct_enum_cmt=true|nl_ds_struct_enum_cmt=false"
+Value=0
+ValueDefault=0
 
 [nl_else_brace]
 Category=4
@@ -840,16 +1043,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_elseif_brace]
 Category=4
 Choices="nl_elseif_brace=ignore|nl_elseif_brace=add|nl_elseif_brace=remove|nl_elseif_brace=force"
-Description="<html>Add or remove newline between 'else if' and '{'. If set to ignore, nl_if_brace is used instead</html>"
+Description="<html>Add or remove newline between 'else if' and '{'<BR>If set to ignore, nl_if_brace is used instead</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_end_of_file]
 Category=4
@@ -858,7 +1061,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_end_of_file_min]
 CallName="nl_end_of_file_min="
@@ -866,7 +1069,7 @@
 Description=<html>The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -878,7 +1081,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_fcall_brace]
 Category=4
@@ -887,7 +1090,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_fdef_brace]
 Category=4
@@ -896,7 +1099,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[nl_finally_brace]
+Category=4
+Choices="nl_finally_brace=ignore|nl_finally_brace=add|nl_finally_brace=remove|nl_finally_brace=force"
+Description=<html>Add or remove newline between 'finally' and '{'</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [nl_for_brace]
 Category=4
@@ -905,7 +1117,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_func_decl_args]
 Category=4
@@ -914,7 +1126,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_func_decl_end]
 Category=4
@@ -923,7 +1135,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_func_decl_start]
 Category=4
@@ -932,16 +1144,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_func_type_name]
 Category=4
 Choices="nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force"
 Description=<html>Add or remove newline between return type and function name in definition</html>
 EditorType=multiple
-Enabled=true
+Enabled=false
 Value=2
-ValueDefault=-1
+ValueDefault=0
 
 [nl_func_var_def_blk]
 CallName="nl_func_var_def_blk="
@@ -949,11 +1161,20 @@
 Description=<html>The number of newlines after a block of variable definitions</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
 
+[nl_getset_brace]
+Category=4
+Choices="nl_getset_brace=ignore|nl_getset_brace=add|nl_getset_brace=remove|nl_getset_brace=force"
+Description=<html>Add or remove newline between get/set and '{'</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
+
 [nl_if_brace]
 Category=4
 Choices="nl_if_brace=ignore|nl_if_brace=add|nl_if_brace=remove|nl_if_brace=force"
@@ -961,7 +1182,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_max]
 CallName="nl_max="
@@ -969,7 +1190,7 @@
 Description=<html>The maximum consecutive newlines</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -981,12 +1202,13 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_squeeze_ifdef]
 Category=4
 Description="<html>Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'</html>"
 EditorType=boolean
+Enabled=false
 TrueFalse="nl_squeeze_ifdef=true|nl_squeeze_ifdef=false"
 Value=0
 ValueDefault=0
@@ -998,7 +1220,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_start_of_file_min]
 CallName="nl_start_of_file_min="
@@ -1006,7 +1228,7 @@
 Description=<html>The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'</html>
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=16
 MinVal=0
 Value=0
 ValueDefault=0
@@ -1018,7 +1240,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_switch_brace]
 Category=4
@@ -1027,16 +1249,25 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_template_class]
 Category=4
 Choices="nl_template_class=ignore|nl_template_class=add|nl_template_class=remove|nl_template_class=force"
-Description=<html>Add or remove newline between 'template<>' and 'class'</html>
+Description="<html>Add or remove newline between 'template&lt;&gt;' and 'class'</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[nl_try_brace]
+Category=4
+Choices="nl_try_brace=ignore|nl_try_brace=add|nl_try_brace=remove|nl_try_brace=force"
+Description=<html>Add or remove newline between 'try' and '{'</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [nl_union_brace]
 Category=4
@@ -1045,7 +1276,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [nl_while_brace]
 Category=4
@@ -1054,7 +1285,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [output_tab_size]
 CallName="output_tab_size="
@@ -1062,8 +1293,8 @@
 Description="<html>The size of tabs in the output (only used if align_with_tabs=true)</html>"
 EditorType=numeric
 Enabled=true
-MaxVal=99
-MinVal=0
+MaxVal=32
+MinVal=1
 Value=4
 ValueDefault=8
 
@@ -1074,7 +1305,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [pos_class_colon]
 Category=5
@@ -1083,7 +1314,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[pos_comma]
+Category=5
+Choices="pos_comma=ignore|pos_comma=lead|pos_comma=trail"
+Description=<html>The position of the comma in wrapped expressions</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [pp_indent]
 Category=9
@@ -1092,7 +1332,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [pp_space]
 Category=9
@@ -1101,25 +1341,25 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_angle]
 Category=2
 Choices="sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force"
-Description=<html>Add or remove space after '<>'</html>
+Description="<html>Add or remove space after '&lt;&gt;'</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_byref]
 Category=2
 Choices="sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force"
-Description=<html>Add or remove space after reference sign '&'</html>
+Description="<html>Add or remove space after reference sign '&amp;'</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_cast]
 Category=2
@@ -1128,7 +1368,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_comma]
 Category=2
@@ -1137,7 +1377,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_operator]
 Category=2
@@ -1146,7 +1386,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_ptr_star]
 Category=2
@@ -1155,7 +1395,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_sparen]
 Category=2
@@ -1164,7 +1404,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_after_tag]
 Category=2
@@ -1173,7 +1413,25 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_angle_paren]
+Category=2
+Choices="sp_angle_paren=ignore|sp_angle_paren=add|sp_angle_paren=remove|sp_angle_paren=force"
+Description="<html>Add or remove space between '&lt;&gt;' and '(' as found in 'new List&lt;byte&gt;();'</html>"
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
+
+[sp_angle_word]
+Category=2
+Choices="sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force"
+Description="<html>Add or remove space between '&lt;&gt;' and a word as in 'List&lt;byte&gt; m;'</html>"
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_arith]
 Category=2
@@ -1182,7 +1440,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_assign]
 Category=2
@@ -1191,25 +1449,43 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_balance_nested_parens]
+Category=2
+Description=<html>Whether to balance spaces inside nested parens</html>
+EditorType=boolean
+Enabled=false
+TrueFalse="sp_balance_nested_parens=true|sp_balance_nested_parens=false"
+Value=0
+ValueDefault=0
 
 [sp_before_angle]
 Category=2
 Choices="sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force"
-Description=<html>Add or remove space before '<>'</html>
+Description="<html>Add or remove space before '&lt;&gt;'</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_before_byref]
 Category=2
 Choices="sp_before_byref=ignore|sp_before_byref=add|sp_before_byref=remove|sp_before_byref=force"
-Description=<html>Add or remove space before reference sign '&'</html>
+Description="<html>Add or remove space before reference sign '&amp;'</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_before_comma]
+Category=2
+Choices="sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force"
+Description="<html>Add or remove space before ','</html>"
+EditorType=multiple
+Enabled=false
+Value=2
+ValueDefault=2
 
 [sp_before_ptr_star]
 Category=2
@@ -1218,7 +1494,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_before_semi]
 Category=2
@@ -1227,7 +1503,25 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_before_semi_for]
+Category=2
+Choices="sp_before_semi_for=ignore|sp_before_semi_for=add|sp_before_semi_for=remove|sp_before_semi_for=force"
+Description="<html>Add or remove space before ';' in non-empty 'for' statements</html>"
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
+
+[sp_before_semi_for_empty]
+Category=2
+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"
+Description=<html>Add or remove space before a semicolon of an empty part of a for statment.</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_before_sparen]
 Category=2
@@ -1236,7 +1530,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_before_square]
 Category=2
@@ -1245,7 +1539,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_before_squares]
 Category=2
@@ -1254,7 +1548,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_between_ptr_star]
 Category=2
@@ -1263,16 +1557,25 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_bool]
 Category=2
 Choices="sp_bool=ignore|sp_bool=add|sp_bool=remove|sp_bool=force"
-Description=<html>Add or remove space around boolean operators '&&' and '||'</html>
+Description="<html>Add or remove space around boolean operators '&amp;&amp;' and '||'</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_brace_catch]
+Category=2
+Choices="sp_brace_catch=ignore|sp_brace_catch=add|sp_brace_catch=remove|sp_brace_catch=force"
+Description=<html>Add or remove space between '}' and 'catch' if on the same line</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_brace_else]
 Category=2
@@ -1281,16 +1584,34 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_brace_finally]
+Category=2
+Choices="sp_brace_finally=ignore|sp_brace_finally=add|sp_brace_finally=remove|sp_brace_finally=force"
+Description=<html>Add or remove space between '}' and 'finally' if on the same line</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
+
+[sp_catch_brace]
+Category=2
+Choices="sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force"
+Description=<html>Add or remove space between 'catch' and '{' if on the same line</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_compare]
 Category=2
 Choices="sp_compare=ignore|sp_compare=add|sp_compare=remove|sp_compare=force"
-Description="<html>Add or remove space around compare operator '<', '>', '==', etc</html>"
+Description="<html>Add or remove space around compare operator '&lt;', '&gt;', '==', etc</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_else_brace]
 Category=2
@@ -1299,7 +1620,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_finally_brace]
+Category=2
+Choices="sp_finally_brace=ignore|sp_finally_brace=add|sp_finally_brace=remove|sp_finally_brace=force"
+Description=<html>Add or remove space between 'finally' and '{' if on the same line</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_fparen_brace]
 Category=2
@@ -1308,7 +1638,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_func_call_paren]
 Category=2
@@ -1317,7 +1647,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_func_class_paren]
 Category=2
@@ -1326,7 +1656,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_func_def_paren]
 Category=2
@@ -1335,7 +1665,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_func_proto_paren]
 Category=2
@@ -1344,16 +1674,25 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_getset_brace]
+Category=2
+Choices="sp_getset_brace=ignore|sp_getset_brace=add|sp_getset_brace=remove|sp_getset_brace=force"
+Description=<html>Add or remove space between get/set and '{' if on the same line</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_inside_angle]
 Category=2
 Choices="sp_inside_angle=ignore|sp_inside_angle=add|sp_inside_angle=remove|sp_inside_angle=force"
-Description=<html># Add or remove space inside '<' and '>'</html>
+Description="<html>Add or remove space inside '&lt;' and '&gt;'</html>"
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_inside_braces]
 Category=2
@@ -1362,7 +1701,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_inside_braces_enum]
 Category=2
@@ -1371,7 +1710,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_inside_braces_struct]
 Category=2
@@ -1380,7 +1719,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_inside_fparen]
 Category=2
@@ -1389,7 +1728,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_inside_fparens]
 Category=2
@@ -1398,7 +1737,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_inside_paren]
 Category=2
@@ -1407,7 +1746,16 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_inside_paren_cast]
+Category=2
+Choices="sp_inside_paren_cast=ignore|sp_inside_paren_cast=add|sp_inside_paren_cast=remove|sp_inside_paren_cast=force"
+Description=<html>Add or remove spaces inside cast parens</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_inside_sparen]
 Category=2
@@ -1416,7 +1764,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_inside_square]
 Category=2
@@ -1425,7 +1773,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_macro]
 Category=2
@@ -1434,7 +1782,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_macro_func]
 Category=2
@@ -1443,7 +1791,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_paren_brace]
 Category=2
@@ -1452,7 +1800,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_paren_paren]
 Category=2
@@ -1461,7 +1809,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_return_paren]
 Category=2
@@ -1470,7 +1818,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_sizeof_paren]
 Category=2
@@ -1479,7 +1827,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_sparen_brace]
 Category=2
@@ -1488,7 +1836,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_special_semi]
 Category=2
@@ -1497,7 +1845,7 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [sp_square_fparen]
 Category=2
@@ -1506,24 +1854,44 @@
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
+
+[sp_try_brace]
+Category=2
+Choices="sp_try_brace=ignore|sp_try_brace=add|sp_try_brace=remove|sp_try_brace=force"
+Description=<html>Add or remove space between 'try' and '{' if on the same line</html>
+EditorType=multiple
+Enabled=false
+Value=0
+ValueDefault=0
 
 [sp_type_func]
 Category=2
 Choices="sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force"
-Description=<html>Add or remove space between return type and function name (a minimum of 1 is forced except for pointer return types)</html>
+Description=<html>Add or remove space between return type and function name<BR>A minimum of 1 is forced except for pointer return types.</html>
 EditorType=multiple
 Enabled=false
 Value=0
-ValueDefault=-1
+ValueDefault=0
 
 [string_escape_char]
 CallName="string_escape_char="
 Category=0
-Description="<html>The ascii value of the string escape char, usually 92 (\\). (Pawn)</html>"
+Description="<html>The ascii value of the string escape char, usually 92 ( or 94 (^). (Pawn)</html>"
 EditorType=numeric
 Enabled=false
-MaxVal=300
+MaxVal=255
 MinVal=0
 Value=92
 ValueDefault=92
+
+[string_escape_char2]
+CallName="string_escape_char2="
+Category=0
+Description=<html>Alternate string escape char for Pawn. Only works right before the quote char.</html>
+EditorType=numeric
+Enabled=false
+MaxVal=255
+MinVal=0
+Value=0
+ValueDefault=0