unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Re: 01/01: gnu: uncrustify: Update to 0.68.1.
       [not found] ` <20181125134156.B66BE209B2@vcs0.savannah.gnu.org>
@ 2018-11-30  0:16   ` Mark H Weaver
  2018-11-30 12:09     ` Pierre Neidhardt
  2018-11-30 22:02     ` Ludovic Courtès
  0 siblings, 2 replies; 6+ messages in thread
From: Mark H Weaver @ 2018-11-30  0:16 UTC (permalink / raw)
  To: Pierre Neidhardt; +Cc: guix-devel

Hi Pierre,

guix-commits@gnu.org writes:

> ambrevar pushed a commit to branch master
> in repository guix.
>
> commit 34843fe9238a041616f063038557d85cd8a30165
> Author: Pierre Neidhardt <mail@ambrevar.xyz>
> Date:   Sun Nov 25 14:41:16 2018 +0100
>
>     gnu: uncrustify: Update to 0.68.1.
>     
>     * gnu/packages/code.scm (uncrustify): Update to 0.68.1.

Hydra failed to download the updated source for this, due to a SHA256
hash mismatch on the source ZIP file.  I can reproduce the same failure
on my laptop:

--8<---------------cut here---------------start------------->8---
mhw@jojen ~$ guix build -S uncrustify
The following derivation will be built:
   /gnu/store/a4sj7y50fwahga5zw33rn22yl1vi5y1w-uncrustify-0.68.1.zip.drv
building /gnu/store/a4sj7y50fwahga5zw33rn22yl1vi5y1w-uncrustify-0.68.1.zip.drv...

Starting download of /gnu/store/6lpmknzjk6rwp5xq3pk0b5akd4h3b1jm-uncrustify-0.68.1.zip
From https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.zip...
following redirection to `https://codeload.github.com/uncrustify/uncrustify/zip/uncrustify-0.68.1'...
downloading from https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.zip...
 uncrustify-0.68.1.zip                                                                                                    1.0MiB/s 00:02 | 2.3MiB transferred
sha256 hash mismatch for /gnu/store/6lpmknzjk6rwp5xq3pk0b5akd4h3b1jm-uncrustify-0.68.1.zip:
  expected hash: 1jb3hmm11m2mgnypapak2lgyyvspnmx9bxd9dxis5swaja2ddxlg
  actual hash:   0yamvqhflvzpvvqwc2qilqdsa3hcbmnb6pf9wzggphhywviksc7w
hash mismatch for store item '/gnu/store/6lpmknzjk6rwp5xq3pk0b5akd4h3b1jm-uncrustify-0.68.1.zip'
build of /gnu/store/a4sj7y50fwahga5zw33rn22yl1vi5y1w-uncrustify-0.68.1.zip.drv failed
View build log at '/var/log/guix/drvs/a4/sj7y50fwahga5zw33rn22yl1vi5y1w-uncrustify-0.68.1.zip.drv.bz2'.
guix build: error: build failed: build of `/gnu/store/a4sj7y50fwahga5zw33rn22yl1vi5y1w-uncrustify-0.68.1.zip.drv' failed
--8<---------------cut here---------------end--------------->8---

Could you take a look?  If upstream modified the tarball in place, could
you show us a 'diff' between the old and new versions?

     Thanks!
       Mark


> ---
>  gnu/packages/code.scm | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
> index 7250325..1e863b0 100644
> --- a/gnu/packages/code.scm
> +++ b/gnu/packages/code.scm
> @@ -540,7 +540,7 @@ independent targets.")
>  (define-public uncrustify
>    (package
>      (name "uncrustify")
> -    (version "0.67")
> +    (version "0.68.1")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -548,10 +548,11 @@ independent targets.")
>                      "uncrustify-" version ".zip"))
>                (sha256
>                 (base32
> -                "0n13kq0nsm35fxhdp0f275n4x0w88hdv3bdjy0hgvv42x0dx5zyp"))))
> +                "1jb3hmm11m2mgnypapak2lgyyvspnmx9bxd9dxis5swaja2ddxlg"))))
>      (build-system cmake-build-system)
>      (native-inputs
> -     `(("unzip" ,unzip)))
> +     `(("unzip" ,unzip)
> +       ("python" ,python-wrapper)))
>      (arguments
>       `(#:phases
>         (modify-phases %standard-phases

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: 01/01: gnu: uncrustify: Update to 0.68.1.
  2018-11-30  0:16   ` 01/01: gnu: uncrustify: Update to 0.68.1 Mark H Weaver
@ 2018-11-30 12:09     ` Pierre Neidhardt
  2018-11-30 15:59       ` Ricardo Wurmus
  2018-11-30 22:02     ` Ludovic Courtès
  1 sibling, 1 reply; 6+ messages in thread
From: Pierre Neidhardt @ 2018-11-30 12:09 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

Hi Mark,

Sadly I've run a "guix gc" in a meantime, and I don't have uncrustify 0.68.1
locally anymore.

That said, I already had a discussion a while ago on the Guix mailing list about
GitHub-generated archives which don't have persistant hash sums.  Reason being,
apparently, because of the archive metadata.

So the best practice would be to never use GitHub generated archives and 
use git-fetch instead on the right tag.

Thoughts?

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: 01/01: gnu: uncrustify: Update to 0.68.1.
  2018-11-30 12:09     ` Pierre Neidhardt
@ 2018-11-30 15:59       ` Ricardo Wurmus
  0 siblings, 0 replies; 6+ messages in thread
From: Ricardo Wurmus @ 2018-11-30 15:59 UTC (permalink / raw)
  To: Pierre Neidhardt; +Cc: guix-devel


Hi Pierre,

> That said, I already had a discussion a while ago on the Guix mailing list about
> GitHub-generated archives which don't have persistant hash sums.  Reason being,
> apparently, because of the archive metadata.
>
> So the best practice would be to never use GitHub generated archives and 
> use git-fetch instead on the right tag.

Yes, we are currently working on getting rid of GitHub generated
archives.  That’s why you see so many commits in the logs that switch
from “/archive” URLs to git-references.

-- 
Ricardo

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: 01/01: gnu: uncrustify: Update to 0.68.1.
  2018-11-30  0:16   ` 01/01: gnu: uncrustify: Update to 0.68.1 Mark H Weaver
  2018-11-30 12:09     ` Pierre Neidhardt
@ 2018-11-30 22:02     ` Ludovic Courtès
  2018-12-01  0:27       ` Tobias Geerinckx-Rice
  1 sibling, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2018-11-30 22:02 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 1454 bytes --]

Hi,

Mark H Weaver <mhw@netris.org> skribis:

> Starting download of /gnu/store/6lpmknzjk6rwp5xq3pk0b5akd4h3b1jm-uncrustify-0.68.1.zip
> From https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.zip...
> following redirection to `https://codeload.github.com/uncrustify/uncrustify/zip/uncrustify-0.68.1'...
> downloading from https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.zip...
>  uncrustify-0.68.1.zip                                                                                                    1.0MiB/s 00:02 | 2.3MiB transferred
> sha256 hash mismatch for /gnu/store/6lpmknzjk6rwp5xq3pk0b5akd4h3b1jm-uncrustify-0.68.1.zip:
>   expected hash: 1jb3hmm11m2mgnypapak2lgyyvspnmx9bxd9dxis5swaja2ddxlg
>   actual hash:   0yamvqhflvzpvvqwc2qilqdsa3hcbmnb6pf9wzggphhywviksc7w
> hash mismatch for store item '/gnu/store/6lpmknzjk6rwp5xq3pk0b5akd4h3b1jm-uncrustify-0.68.1.zip'

The previous file is at
<https://berlin.guixsd.org/file/uncrustify-0.68.1.zip/sha256/1jb3hmm11m2mgnypapak2lgyyvspnmx9bxd9dxis5swaja2ddxlg>.

The diff between the two archives is substantial (attached).

I guess upstream modified the Git tag, which in turn led to a new zip
file.  It would be nice to report it upstream.

Note that we’d be in the same situation if we were using ‘git-fetch’
here.  The problem really has to do with the mutability of tags:

  https://issues.guix.info/issue/33432#3

Ludo’.


[-- Attachment #2: the patch --]
[-- Type: text/x-patch, Size: 877150 bytes --]

diff -ru orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt new/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt
--- orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt	2018-11-20 18:04:30.000000000 +0100
+++ new/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt	2018-11-22 09:59:35.000000000 +0100
@@ -1,2684 +1,2197 @@
-# Uncrustify-0.68
-
+# Uncrustify-0.67
 #
 # General options
 #
 
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
+newlines                        { Auto, LF, CR, CRLF }
+  The type of line endings. Default=Auto.
 
-# The original size of tabs in the input.
-#
-# Default: 8
-input_tab_size                  = 8        # unsigned number
+input_tab_size                  Unsigned Number
+  The original size of tabs in the input. Default=8.
 
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
-output_tab_size                 = 8        # unsigned number
+output_tab_size                 Unsigned Number
+  The size of tabs in the output (only used if align_with_tabs=true). Default=8.
 
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
+string_escape_char              Unsigned Number
+  The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn).
 
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
+string_escape_char2             Unsigned Number
+  Alternate string escape char for Pawn. Only works right before the quote char.
 
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
+string_replace_tab_chars        { False, True }
+  Replace tab characters found in string literals with the escape sequence \t instead.
 
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
+tok_split_gte                   { False, True }
+  Allow interpreting '>=' and '>>=' as part of a template in 'void f(list<list<B>>=val);'.
+  If True, 'assert(x<0 && y>=3)' will be broken. Default=False
+  Improvements to template detection may make this option obsolete.
 
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
+disable_processing_cmt          String
+  Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file.
 
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
+enable_processing_cmt           String
+  Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file.
 
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
+enable_digraphs                 { False, True }
+  Enable parsing of digraphs. Default=False.
 
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
+utf8_bom                        { Ignore, Add, Remove, Force }
+  Control what to do with the UTF-8 BOM (recommend 'remove').
 
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
+utf8_byte                       { False, True }
+  If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8.
 
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
+utf8_force                      { False, True }
+  Force the output encoding to UTF-8.
 
 #
 # Spacing options
 #
 
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
+sp_arith                        { Ignore, Add, Remove, Force }
+  Add or remove space around arithmetic operator '+', '-', '/', '*', etc
+  also '>>>' '<<' '>>' '%' '|'.
 
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
+sp_arith_additive               { Ignore, Add, Remove, Force }
+  Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith
 
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
+sp_assign                       { Ignore, Add, Remove, Force }
+  Add or remove space around assignment operator '=', '+=', etc.
 
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force
+sp_cpp_lambda_assign            { Ignore, Add, Remove, Force }
+  Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign.
 
-# Add or remove space after the capture specification in C++11 lambda.
-sp_cpp_lambda_paren             = ignore   # ignore/add/remove/force
+sp_cpp_lambda_paren             { Ignore, Add, Remove, Force }
+  Add or remove space after the capture specification in C++11 lambda.
 
-# Add or remove space around assignment operator '=' in a prototype.
-sp_assign_default               = ignore   # ignore/add/remove/force
+sp_assign_default               { Ignore, Add, Remove, Force }
+  Add or remove space around assignment operator '=' in a prototype.
 
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
+sp_before_assign                { Ignore, Add, Remove, Force }
+  Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.
 
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
+sp_after_assign                 { Ignore, Add, Remove, Force }
+  Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.
 
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
+sp_enum_paren                   { Ignore, Add, Remove, Force }
+  Add or remove space in 'NS_ENUM ('.
 
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
+sp_enum_assign                  { Ignore, Add, Remove, Force }
+  Add or remove space around assignment '=' in enum.
 
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force
+sp_enum_before_assign           { Ignore, Add, Remove, Force }
+  Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.
 
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force
+sp_enum_after_assign            { Ignore, Add, Remove, Force }
+  Add or remove space after assignment '=' in enum. Overrides sp_enum_assign.
 
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
+sp_enum_colon                   { Ignore, Add, Remove, Force }
+  Add or remove space around assignment ':' in enum.
 
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
+sp_pp_concat                    { Ignore, Add, Remove, Force }
+  Add or remove space around preprocessor '##' concatenation operator. Default=Add.
 
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force
+sp_pp_stringify                 { Ignore, Add, Remove, Force }
+  Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator.
 
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force
+sp_before_pp_stringify          { Ignore, Add, Remove, Force }
+  Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'.
 
-# Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
+sp_bool                         { Ignore, Add, Remove, Force }
+  Add or remove space around boolean operators '&&' and '||'.
 
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
+sp_compare                      { Ignore, Add, Remove, Force }
+  Add or remove space around compare operator '<', '>', '==', etc.
 
-# Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
+sp_inside_paren                 { Ignore, Add, Remove, Force }
+  Add or remove space inside '(' and ')'.
 
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
+sp_paren_paren                  { Ignore, Add, Remove, Force }
+  Add or remove space between nested parens: '((' vs ') )'.
 
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
+sp_cparen_oparen                { Ignore, Add, Remove, Force }
+  Add or remove space between back-to-back parens: ')(' vs ') ('.
 
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
+sp_balance_nested_parens        { False, True }
+  Whether to balance spaces inside nested parens.
 
-# Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
+sp_paren_brace                  { Ignore, Add, Remove, Force }
+  Add or remove space between ')' and '{'.
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
+sp_before_ptr_star              { Ignore, Add, Remove, Force }
+  Add or remove space before pointer star '*'.
 
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
+sp_before_unnamed_ptr_star      { Ignore, Add, Remove, Force }
+  Add or remove space before pointer star '*' that isn't followed by a variable name
+  If set to 'ignore', sp_before_ptr_star is used instead.
 
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to 'ignore', sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
+sp_between_ptr_star             { Ignore, Add, Remove, Force }
+  Add or remove space between pointer stars '*'.
 
-# Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_after_ptr_star               { Ignore, Add, Remove, Force }
+  Add or remove space after pointer star '*', if followed by a word.
 
-# Add or remove space after pointer star '*', if followed by a word.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
+sp_after_ptr_block_caret        { Ignore, Add, Remove, Force }
+  Add or remove space after pointer caret '^', if followed by a word.
 
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force
+sp_after_ptr_star_qualifier     { Ignore, Add, Remove, Force }
+  Add or remove space after pointer star '*', if followed by a qualifier.
 
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force
+sp_after_ptr_star_func          { Ignore, Add, Remove, Force }
+  Add or remove space after a pointer star '*', if followed by a func proto/def.
 
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+sp_ptr_star_paren               { Ignore, Add, Remove, Force }
+  Add or remove space after a pointer star '*', if followed by an open paren (function types).
 
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force
+sp_before_ptr_star_func         { Ignore, Add, Remove, Force }
+  Add or remove space before a pointer star '*', if followed by a func proto/def.
 
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force
+sp_before_byref                 { Ignore, Add, Remove, Force }
+  Add or remove space before a reference sign '&'.
 
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
+sp_before_unnamed_byref         { Ignore, Add, Remove, Force }
+  Add or remove space before a reference sign '&' that isn't followed by a variable name.
+  If set to 'ignore', sp_before_byref is used instead.
 
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to 'ignore', sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force
+sp_after_byref                  { Ignore, Add, Remove, Force }
+  Add or remove space after reference sign '&', if followed by a word.
 
-# Add or remove space after reference sign '&', if followed by a word.
-sp_after_byref                  = ignore   # ignore/add/remove/force
+sp_after_byref_func             { Ignore, Add, Remove, Force }
+  Add or remove space after a reference sign '&', if followed by a func proto/def.
 
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
+sp_before_byref_func            { Ignore, Add, Remove, Force }
+  Add or remove space before a reference sign '&', if followed by a func proto/def.
 
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force
+sp_after_type                   { Ignore, Add, Remove, Force }
+  Add or remove space between type and word. Default=Force.
 
-# Add or remove space between type and word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force
+sp_before_template_paren        { Ignore, Add, Remove, Force }
+  Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('.
 
-# Add or remove space between 'decltype(...)' and word.
-sp_after_decltype               = ignore   # ignore/add/remove/force
+sp_template_angle               { Ignore, Add, Remove, Force }
+  Add or remove space in 'template <' vs 'template<'.
+  If set to ignore, sp_before_angle is used.
 
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force
+sp_before_angle                 { Ignore, Add, Remove, Force }
+  Add or remove space before '<>'.
 
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force
+sp_inside_angle                 { Ignore, Add, Remove, Force }
+  Add or remove space inside '<' and '>'.
 
-# Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
+sp_angle_colon                  { Ignore, Add, Remove, Force }
+  Add or remove space between '<>' and ':'.
 
-# Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
+sp_after_angle                  { Ignore, Add, Remove, Force }
+  Add or remove space after '<>'.
 
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
+sp_angle_paren                  { Ignore, Add, Remove, Force }
+  Add or remove space between '<>' and '(' as found in 'new List<byte>(foo);'.
 
-# Add or remove space after '<>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
+sp_angle_paren_empty            { Ignore, Add, Remove, Force }
+  Add or remove space between '<>' and '()' as found in 'new List<byte>();'.
 
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
+sp_angle_word                   { Ignore, Add, Remove, Force }
+  Add or remove space between '<>' and a word as in 'List<byte> m;' or 'template <typename T> static ...'.
 
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+sp_angle_shift                  { Ignore, Add, Remove, Force }
+  Add or remove space between '>' and '>' in '>>' (template stuff). Default=Add.
 
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
-sp_angle_word                   = ignore   # ignore/add/remove/force
+sp_permit_cpp11_shift           { False, True }
+  Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False.
+  sp_angle_shift cannot remove the space without this option.
 
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_before_sparen                { Ignore, Add, Remove, Force }
+  Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc.
 
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
+sp_inside_sparen                { Ignore, Add, Remove, Force }
+  Add or remove space inside if-condition '(' and ')'.
 
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen_close          { Ignore, Add, Remove, Force }
+  Add or remove space before if-condition ')'. Overrides sp_inside_sparen.
 
-# Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen_open           { Ignore, Add, Remove, Force }
+  Add or remove space after if-condition '('. Overrides sp_inside_sparen.
 
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+sp_after_sparen                 { Ignore, Add, Remove, Force }
+  Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc.
 
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+sp_sparen_brace                 { Ignore, Add, Remove, Force }
+  Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc.
 
-# Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
+sp_invariant_paren              { Ignore, Add, Remove, Force }
+  Add or remove space between 'invariant' and '(' in the D language.
 
-# Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
+sp_after_invariant_paren        { Ignore, Add, Remove, Force }
+  Add or remove space after the ')' in 'invariant (C) c' in the D language.
 
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
+sp_special_semi                 { Ignore, Add, Remove, Force }
+  Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
 
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+sp_before_semi                  { Ignore, Add, Remove, Force }
+  Add or remove space before ';'. Default=Remove.
 
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
+sp_before_semi_for              { Ignore, Add, Remove, Force }
+  Add or remove space before ';' in non-empty 'for' statements.
 
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
+sp_before_semi_for_empty        { Ignore, Add, Remove, Force }
+  Add or remove space before a semicolon of an empty part of a for statement.
 
-# Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_after_semi                   { Ignore, Add, Remove, Force }
+  Add or remove space after ';', except when followed by a comment. Default=Add.
 
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force
+sp_after_semi_for               { Ignore, Add, Remove, Force }
+  Add or remove space after ';' in non-empty 'for' statements. Default=Force.
 
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
+sp_after_semi_for_empty         { Ignore, Add, Remove, Force }
+  Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; <here> ).
 
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
+sp_before_square                { Ignore, Add, Remove, Force }
+  Add or remove space before '[' (except '[]').
 
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
-sp_after_semi_for_empty         = ignore   # ignore/add/remove/force
+sp_before_squares               { Ignore, Add, Remove, Force }
+  Add or remove space before '[]'.
 
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
+sp_cpp_before_struct_binding    { Ignore, Add, Remove, Force }
+  Add or remove space before structured bindings. Only for C++17.
 
-# Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
+sp_inside_square                { Ignore, Add, Remove, Force }
+  Add or remove space inside a non-empty '[' and ']'.
 
-# Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+sp_inside_square_oc_array       { Ignore, Add, Remove, Force }
+  Add or remove space inside a non-empty OC boxed array '@[' and ']'.
+  If set to ignore, sp_inside_square is used.
 
-# Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
+sp_after_comma                  { Ignore, Add, Remove, Force }
+  Add or remove space after ',', 'a,b' vs 'a, b'.
 
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
+sp_before_comma                 { Ignore, Add, Remove, Force }
+  Add or remove space before ','. Default=Remove.
 
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_mdatype_commas         { Ignore, Add, Remove, Force }
+  Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#.
 
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
-
-# Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
+sp_before_mdatype_commas        { Ignore, Add, Remove, Force }
+  Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#.
 
-# Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
+sp_between_mdatype_commas       { Ignore, Add, Remove, Force }
+  Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#.
 
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_paren_comma                  { Ignore, Add, Remove, Force }
+  Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force.
 
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_ellipsis              { Ignore, Add, Remove, Force }
+  Add or remove space before the variadic '...' when preceded by a non-punctuator.
 
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
+sp_after_class_colon            { Ignore, Add, Remove, Force }
+  Add or remove space after class ':'.
 
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
+sp_before_class_colon           { Ignore, Add, Remove, Force }
+  Add or remove space before class ':'.
 
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           { Ignore, Add, Remove, Force }
+  Add or remove space after class constructor ':'.
 
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force
+sp_before_constr_colon          { Ignore, Add, Remove, Force }
+  Add or remove space before class constructor ':'.
 
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force
+sp_before_case_colon            { Ignore, Add, Remove, Force }
+  Add or remove space before case ':'. Default=Remove.
 
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_after_operator               { Ignore, Add, Remove, Force }
+  Add or remove space between 'operator' and operator sign.
 
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force
+sp_after_operator_sym           { Ignore, Add, Remove, Force }
+  Add or remove space between the operator symbol and the open paren, as in 'operator ++('.
 
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+sp_after_operator_sym_empty     { Ignore, Add, Remove, Force }
+  Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'.
 
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_after_cast                   { Ignore, Add, Remove, Force }
+  Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'.
 
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            { Ignore, Add, Remove, Force }
+  Add or remove spaces inside cast parens.
 
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
+sp_cpp_cast_paren               { Ignore, Add, Remove, Force }
+  Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'.
 
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
+sp_sizeof_paren                 { Ignore, Add, Remove, Force }
+  Add or remove space between 'sizeof' and '('.
 
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_after_tag                    { Ignore, Add, Remove, Force }
+  Add or remove space after the tag keyword (Pawn).
 
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           { Ignore, Add, Remove, Force }
+  Add or remove space inside enum '{' and '}'.
 
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         { Ignore, Add, Remove, Force }
+  Add or remove space inside struct/union '{' and '}'.
 
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force
+sp_inside_braces_oc_dict        { Ignore, Add, Remove, Force }
+  Add or remove space inside OC boxed dictionary @'{' and '}'
 
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force
+sp_after_type_brace_init_lst_open { Ignore, Add, Remove, Force }
+  Add or remove space after open brace in an unnamed temporary direct-list-initialization.
 
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+sp_before_type_brace_init_lst_close { Ignore, Add, Remove, Force }
+  Add or remove space before close brace in an unnamed temporary direct-list-initialization.
 
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_type_brace_init_lst   { Ignore, Add, Remove, Force }
+  Add or remove space inside an unnamed temporary direct-list-initialization.
 
-# Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces                { Ignore, Add, Remove, Force }
+  Add or remove space inside '{' and '}'.
 
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          { Ignore, Add, Remove, Force }
+  Add or remove space inside '{}'.
 
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force
+sp_type_func                    { Ignore, Add, Remove, Force }
+  Add or remove space between return type and function name
+  A minimum of 1 is forced except for pointer return types.
 
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
+sp_type_brace_init_lst          { Ignore, Add, Remove, Force }
+  Add or remove space between type and open brace of an unnamed temporary direct-list-initialization.
 
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
+sp_func_proto_paren             { Ignore, Add, Remove, Force }
+  Add or remove space between function name and '(' on function declaration.
 
-# Add or remove space between function name and '(' on function definition.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_proto_paren_empty       { Ignore, Add, Remove, Force }
+  Add or remove space between function name and '()' on function declaration without parameters.
 
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
+sp_func_def_paren               { Ignore, Add, Remove, Force }
+  Add or remove space between function name and '(' on function definition.
 
-# Add or remove space inside empty function '()'.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_func_def_paren_empty         { Ignore, Add, Remove, Force }
+  Add or remove space between function name and '()' on function definition without parameters.
 
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparens               { Ignore, Add, Remove, Force }
+  Add or remove space inside empty function '()'.
 
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                { Ignore, Add, Remove, Force }
+  Add or remove space inside function '(' and ')'.
 
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force
+sp_inside_tparen                { Ignore, Add, Remove, Force }
+  Add or remove space inside the first parens in the function type: 'void (*x)(...)'.
 
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_after_tparen_close           { Ignore, Add, Remove, Force }
+  Add or remove between the parens in the function type: 'void (*x)(...)'.
 
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
+sp_square_fparen                { Ignore, Add, Remove, Force }
+  Add or remove space between ']' and '(' when part of a function call.
 
-# Add or remove space between ')' and '{' of s function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+sp_fparen_brace                 { Ignore, Add, Remove, Force }
+  Add or remove space between ')' and '{' of function.
 
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+sp_fparen_brace_initializer     { Ignore, Add, Remove, Force }
+  Add or remove space between ')' and '{' of function call in object initialization. Overrides sp_fparen_brace.
 
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_fparen_dbrace                { Ignore, Add, Remove, Force }
+  Java: Add or remove space between ')' and '{{' of double brace initializer.
 
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to 'ignore' (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force
+sp_func_call_paren              { Ignore, Add, Remove, Force }
+  Add or remove space between function name and '(' on function calls.
 
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force
+sp_func_call_paren_empty        { Ignore, Add, Remove, Force }
+  Add or remove space between function name and '()' on function calls without parameters.
+  If set to 'ignore' (the default), sp_func_call_paren is used.
 
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+sp_func_call_user_paren         { Ignore, Add, Remove, Force }
+  Add or remove space between the user function name and '(' on function calls
+  You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force
+sp_func_call_user_inside_fparen { Ignore, Add, Remove, Force }
+  Add or remove space inside user function '(' and ')'
+  You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
+sp_func_call_user_paren_paren   { Ignore, Add, Remove, Force }
+  Add or remove space between nested parens with user functions: '((' vs ') )'You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force
+sp_func_class_paren             { Ignore, Add, Remove, Force }
+  Add or remove space between a constructor/destructor and the open paren.
 
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
+sp_func_class_paren_empty       { Ignore, Add, Remove, Force }
+  Add or remove space between a constructor without parameters or destructor and '()'.
 
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
+sp_return_paren                 { Ignore, Add, Remove, Force }
+  Add or remove space between 'return' and '('.
 
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              { Ignore, Add, Remove, Force }
+  Add or remove space between '__attribute__' and '('.
 
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
+sp_defined_paren                { Ignore, Add, Remove, Force }
+  Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
 
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
+sp_throw_paren                  { Ignore, Add, Remove, Force }
+  Add or remove space between 'throw' and '(' in 'throw (something)'.
 
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force
+sp_after_throw                  { Ignore, Add, Remove, Force }
+  Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'.
 
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force
+sp_catch_paren                  { Ignore, Add, Remove, Force }
+  Add or remove space between 'catch' and '(' in 'catch (something) { }'
+  If set to ignore, sp_before_sparen is used.
 
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force
+sp_oc_catch_paren               { Ignore, Add, Remove, Force }
+  Add or remove space between '@catch' and '(' in '@catch (something) { }'
+  If set to ignore, sp_catch_paren is used.
 
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force
+sp_version_paren                { Ignore, Add, Remove, Force }
+  Add or remove space between 'version' and '(' in 'version (something) { }' (D language)
+  If set to ignore, sp_before_sparen is used.
 
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force
+sp_scope_paren                  { Ignore, Add, Remove, Force }
+  Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language)
+  If set to ignore, sp_before_sparen is used.
 
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
+sp_super_paren                  { Ignore, Add, Remove, Force }
+  Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove.
 
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
+sp_this_paren                   { Ignore, Add, Remove, Force }
+  Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove.
 
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
+sp_macro                        { Ignore, Add, Remove, Force }
+  Add or remove space between macro and value.
 
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
+sp_macro_func                   { Ignore, Add, Remove, Force }
+  Add or remove space between macro function ')' and value.
 
-# Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
+sp_else_brace                   { Ignore, Add, Remove, Force }
+  Add or remove space between 'else' and '{' if on the same line.
 
-# Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
+sp_brace_else                   { Ignore, Add, Remove, Force }
+  Add or remove space between '}' and 'else' if on the same line.
 
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force
+sp_brace_typedef                { Ignore, Add, Remove, Force }
+  Add or remove space between '}' and the name of a typedef on the same line.
 
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
-sp_catch_brace                  = ignore   # ignore/add/remove/force
+sp_catch_brace                  { Ignore, Add, Remove, Force }
+  Add or remove space between 'catch' and '{' if on the same line.
 
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force
+sp_oc_catch_brace               { Ignore, Add, Remove, Force }
+  Add or remove space between '@catch' and '{' if on the same line.
+  If set to ignore, sp_catch_brace is used.
 
-# Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
+sp_brace_catch                  { Ignore, Add, Remove, Force }
+  Add or remove space between '}' and 'catch' if on the same line.
 
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force
+sp_oc_brace_catch               { Ignore, Add, Remove, Force }
+  Add or remove space between '}' and '@catch' if on the same line.
+  If set to ignore, sp_brace_catch is used.
 
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
+sp_finally_brace                { Ignore, Add, Remove, Force }
+  Add or remove space between 'finally' and '{' if on the same line.
 
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
+sp_brace_finally                { Ignore, Add, Remove, Force }
+  Add or remove space between '}' and 'finally' if on the same line.
 
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
+sp_try_brace                    { Ignore, Add, Remove, Force }
+  Add or remove space between 'try' and '{' if on the same line.
 
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force
+sp_getset_brace                 { Ignore, Add, Remove, Force }
+  Add or remove space between get/set and '{' if on the same line.
 
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-#
-# Default: add
-sp_word_brace                   = add      # ignore/add/remove/force
+sp_word_brace                   { Ignore, Add, Remove, Force }
+  Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add.
 
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force
+sp_word_brace_ns                { Ignore, Add, Remove, Force }
+  Add or remove space between a variable and '{' for a namespace. Default=Add.
 
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
+sp_before_dc                    { Ignore, Add, Remove, Force }
+  Add or remove space before the '::' operator.
 
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
+sp_after_dc                     { Ignore, Add, Remove, Force }
+  Add or remove space after the '::' operator.
 
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force
+sp_d_array_colon                { Ignore, Add, Remove, Force }
+  Add or remove around the D named array initializer ':' operator.
 
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force
+sp_not                          { Ignore, Add, Remove, Force }
+  Add or remove space after the '!' (not) operator. Default=Remove.
 
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+sp_inv                          { Ignore, Add, Remove, Force }
+  Add or remove space after the '~' (invert) operator. Default=Remove.
 
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force
+sp_addr                         { Ignore, Add, Remove, Force }
+  Add or remove space after the '&' (address-of) operator. Default=Remove
+  This does not affect the spacing after a '&' that is part of a type.
 
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+sp_member                       { Ignore, Add, Remove, Force }
+  Add or remove space around the '.' or '->' operators. Default=Remove.
 
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force
+sp_deref                        { Ignore, Add, Remove, Force }
+  Add or remove space after the '*' (dereference) operator. Default=Remove
+  This does not affect the spacing after a '*' that is part of a type.
 
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+sp_sign                         { Ignore, Add, Remove, Force }
+  Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove.
 
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force
+sp_incdec                       { Ignore, Add, Remove, Force }
+  Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove.
 
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force
+sp_before_nl_cont               { Ignore, Add, Remove, Force }
+  Add or remove space before a backslash-newline at the end of a line. Default=Add.
 
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force
+sp_after_oc_scope               { Ignore, Add, Remove, Force }
+  Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'.
 
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force
+sp_after_oc_colon               { Ignore, Add, Remove, Force }
+  Add or remove space after the colon in message specs
+  '-(int) f:(int) x;' vs '-(int) f: (int) x;'.
 
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force
+sp_before_oc_colon              { Ignore, Add, Remove, Force }
+  Add or remove space before the colon in message specs
+  '-(int) f: (int) x;' vs '-(int) f : (int) x;'.
 
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force
+sp_after_oc_dict_colon          { Ignore, Add, Remove, Force }
+  Add or remove space after the colon in immutable dictionary expression
+  'NSDictionary *test = @{@"foo" :@"bar"};'.
 
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force
+sp_before_oc_dict_colon         { Ignore, Add, Remove, Force }
+  Add or remove space before the colon in immutable dictionary expression
+  'NSDictionary *test = @{@"foo" :@"bar"};'.
 
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force
+sp_after_send_oc_colon          { Ignore, Add, Remove, Force }
+  Add or remove space after the colon in message specs
+  '[object setValue:1];' vs '[object setValue: 1];'.
 
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force
+sp_before_send_oc_colon         { Ignore, Add, Remove, Force }
+  Add or remove space before the colon in message specs
+  '[object setValue:1];' vs '[object setValue :1];'.
 
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force
+sp_after_oc_type                { Ignore, Add, Remove, Force }
+  Add or remove space after the (type) in message specs
+  '-(int)f: (int) x;' vs '-(int)f: (int)x;'.
 
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force
+sp_after_oc_return_type         { Ignore, Add, Remove, Force }
+  Add or remove space after the first (type) in message specs
+  '-(int) f:(int)x;' vs '-(int)f:(int)x;'.
 
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force
+sp_after_oc_at_sel              { Ignore, Add, Remove, Force }
+  Add or remove space between '@selector' and '('
+  '@selector(msgName)' vs '@selector (msgName)'
+  Also applies to @protocol() constructs.
 
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force
+sp_after_oc_at_sel_parens       { Ignore, Add, Remove, Force }
+  Add or remove space between '@selector(x)' and the following word
+  '@selector(foo) a:' vs '@selector(foo)a:'.
 
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force
+sp_inside_oc_at_sel_parens      { Ignore, Add, Remove, Force }
+  Add or remove space inside '@selector' parens
+  '@selector(foo)' vs '@selector( foo )'
+  Also applies to @protocol() constructs.
 
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force
+sp_before_oc_block_caret        { Ignore, Add, Remove, Force }
+  Add or remove space before a block pointer caret
+  '^int (int arg){...}' vs. ' ^int (int arg){...}'.
 
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force
+sp_after_oc_block_caret         { Ignore, Add, Remove, Force }
+  Add or remove space after a block pointer caret
+  '^int (int arg){...}' vs. '^ int (int arg){...}'.
 
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force
+sp_after_oc_msg_receiver        { Ignore, Add, Remove, Force }
+  Add or remove space between the receiver and selector in a message.
+  '[receiver selector ...]'.
 
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+sp_after_oc_property            { Ignore, Add, Remove, Force }
+  Add or remove space after @property.
 
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force
+sp_after_oc_synchronized        { Ignore, Add, Remove, Force }
+  Add or remove space between '@synchronized' and the parenthesis
+  '@synchronized(foo)' vs '@synchronized (foo)'.
 
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+sp_cond_colon                   { Ignore, Add, Remove, Force }
+  Add or remove space around the ':' in 'b ? t : f'.
 
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force
+sp_cond_colon_before            { Ignore, Add, Remove, Force }
+  Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon.
 
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force
+sp_cond_colon_after             { Ignore, Add, Remove, Force }
+  Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon.
 
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
+sp_cond_question                { Ignore, Add, Remove, Force }
+  Add or remove space around the '?' in 'b ? t : f'.
 
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force
+sp_cond_question_before         { Ignore, Add, Remove, Force }
+  Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question.
 
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force
+sp_cond_question_after          { Ignore, Add, Remove, Force }
+  Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question.
 
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force
+sp_cond_ternary_short           { Ignore, Add, Remove, Force }
+  In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options.
 
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force
+sp_case_label                   { Ignore, Add, Remove, Force }
+  Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
 
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
+sp_range                        { Ignore, Add, Remove, Force }
+  Control the space around the D '..' operator.
 
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force
+sp_after_for_colon              { Ignore, Add, Remove, Force }
+  Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.
 
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force
+sp_before_for_colon             { Ignore, Add, Remove, Force }
+  Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
+sp_extern_paren                 { Ignore, Add, Remove, Force }
+  Control the spacing in 'extern (C)' (D).
 
-# Add or remove space after the opening of a C++ comment,
-# i.e. '// A' vs. '//A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force
+sp_cmt_cpp_start                { Ignore, Add, Remove, Force }
+  Control the space after the opening of a C++ comment '// A' vs '//A'.
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
+sp_cmt_cpp_doxygen              { False, True }
+  True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'.
 
-# If true, space is added with sp_cmt_cpp_start will be added after Qt
-# translator or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
+sp_cmt_cpp_qttr                 { False, True }
+  True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'.
 
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    { Ignore, Add, Remove, Force }
+  Controls the spaces between #else or #endif and a trailing comment.
 
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
+sp_after_new                    { Ignore, Add, Remove, Force }
+  Controls the spaces after 'new', 'delete' and 'delete[]'.
 
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
+sp_between_new_paren            { Ignore, Add, Remove, Force }
+  Controls the spaces between new and '(' in 'new()'.
 
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force
+sp_after_newop_paren            { Ignore, Add, Remove, Force }
+  Controls the spaces between ')' and 'type' in 'new(foo) BAR'.
 
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force
+sp_inside_newop_paren           { Ignore, Add, Remove, Force }
+  Controls the spaces inside paren of the new operator: 'new(foo) BAR'.
 
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force
+sp_inside_newop_paren_open      { Ignore, Add, Remove, Force }
+  Controls the space after open paren of the new operator: 'new(foo) BAR'.
+  Overrides sp_inside_newop_paren.
 
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force
+sp_inside_newop_paren_close     { Ignore, Add, Remove, Force }
+  Controls the space before close paren of the new operator: 'new(foo) BAR'.
+  Overrides sp_inside_newop_paren.
 
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force
+sp_before_tr_emb_cmt            { Ignore, Add, Remove, Force }
+  Controls the spaces before a trailing or embedded comment.
 
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
+sp_num_before_tr_emb_cmt        Unsigned Number
+  Number of spaces before a trailing or embedded comment.
 
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
+sp_annotation_paren             { Ignore, Add, Remove, Force }
+  Control space between a Java annotation and the open paren.
 
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
+sp_skip_vbrace_tokens           { False, True }
+  If True, vbrace tokens are dropped to the previous token and skipped.
 
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
+sp_after_noexcept               { Ignore, Add, Remove, Force }
+  Controls the space after 'noexcept'.
 
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
+force_tab_after_define          { False, True }
+  If True, a <TAB> is inserted after #define.
 
 #
-# Indenting options
+# Indenting
 #
 
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 8        # unsigned number
+indent_columns                  Unsigned Number
+  The number of columns to indent per level.
+  Usually 2, 3, 4, or 8. Default=8.
 
-# The continuation indent. If non-zero, this overrides the indent of '(' and
-# '=' continuation indents. Negative values are OK; negative value is absolute
-# and not increased for each '(' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
+indent_continue                 Number
+  The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
+  For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level.
 
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
+indent_single_newlines          { False, True }
+  Indent empty lines - lines which contain only spaces before newline character
 
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
+indent_param                    Unsigned Number
+  The continuation indent for func_*_param if they are true.
+  If non-zero, this overrides the indent.
 
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
+indent_with_tabs                Unsigned Number
+  How to use tabs when indenting code
+  0=spaces only
+  1=indent with tabs to brace level, align with spaces (default)
+  2=indent and align with tabs, using spaces when not on a tabstop
 
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 1        # unsigned number
+indent_cmt_with_tabs            { False, True }
+  Comments that are not a brace level are indented with tabs on a tabstop.
+  Requires indent_with_tabs=2. If false, will use spaces.
 
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
+indent_align_string             { False, True }
+  Whether to indent strings broken by '\' so that they line up.
 
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
+indent_xml_string               Unsigned Number
+  The number of spaces to indent multi-line XML strings.
+  Requires indent_align_string=True.
 
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
+indent_brace                    Unsigned Number
+  Spaces to indent '{' from level.
 
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
+indent_braces                   { False, True }
+  Whether braces are indented to the body level.
 
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
+indent_braces_no_func           { False, True }
+  Disabled indenting function braces if indent_braces is True.
 
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
+indent_braces_no_class          { False, True }
+  Disabled indenting class braces if indent_braces is True.
 
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
+indent_braces_no_struct         { False, True }
+  Disabled indenting struct braces if indent_braces is True.
 
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
+indent_brace_parent             { False, True }
+  Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
 
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' → 3 spaces, 'for' → 4 spaces, etc.
-indent_brace_parent             = false    # true/false
+indent_paren_open_brace         { False, True }
+  Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace.
 
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
+indent_cs_delegate_brace        { False, True }
+  indent a C# delegate by another level, default is to not indent by another level.
 
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
+indent_cs_delegate_body         { False, True }
+  indent a C# delegate(To hanndle delegates with no brace) by another level. default: false
 
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
+indent_namespace                { False, True }
+  Whether the 'namespace' body is indented.
 
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
+indent_namespace_single_indent  { False, True }
+  Only indent one namespace and no sub-namespaces.
+  Requires indent_namespace=True.
 
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
+indent_namespace_level          Unsigned Number
+  The number of spaces to indent a namespace block.
 
-# The number of spaces to indent a namespace block.
-indent_namespace_level          = 0        # unsigned number
+indent_namespace_limit          Unsigned Number
+  If the body of the namespace is longer than this number, it won't be indented.
+  Requires indent_namespace=True. Default=0 (no limit)
 
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
+indent_extern                   { False, True }
+  Whether the 'extern "C"' body is indented.
 
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
+indent_class                    { False, True }
+  Whether the 'class' body is indented.
 
-# Whether the 'class' body is indented.
-indent_class                    = false    # true/false
+indent_class_colon              { False, True }
+  Whether to indent the stuff after a leading base class colon.
 
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
+indent_class_on_colon           { False, True }
+  Indent based on a class colon instead of the stuff after the colon.
+  Requires indent_class_colon=True. Default=False.
 
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
+indent_constr_colon             { False, True }
+  Whether to indent the stuff after a leading class initializer colon.
 
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
+indent_ctor_init_leading        Unsigned Number
+  Virtual indent from the ':' for member initializers. Default=2.
 
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
+indent_ctor_init                Number
+  Additional indent for constructor initializer list.
+  Negative values decrease indent down to the first column. Default=0.
 
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
+indent_else_if                  { False, True }
+  False=treat 'else\nif' as 'else if' for indenting purposes
+  True=indent the 'if' one level.
 
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
+indent_var_def_blk              Number
+  Amount to indent variable declarations after a open brace. neg=relative, pos=absolute.
 
-# Amount to indent variable declarations after a open brace.
-#
-# <0: Relative
-# ≥0: Absolute
-indent_var_def_blk              = 0        # number
+indent_var_def_cont             { False, True }
+  Indent continued variable declarations instead of aligning.
 
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
+indent_shift                    { False, True }
+  Indent continued shift expressions ('<<' and '>>') instead of aligning.
+  Turn align_left_shift off when enabling this.
 
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
+indent_func_def_force_col1      { False, True }
+  True:  force indentation of function definition to start in column 1
+  False: use the default behavior.
 
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
+indent_func_call_param          { False, True }
+  True:  indent continued function call parameters one indent level
+  False: align parameters under the open paren.
 
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
+indent_func_def_param           { False, True }
+  Same as indent_func_call_param, but for function defs.
 
-# Same as indent_func_call_param, but for function definitions.
-indent_func_def_param           = false    # true/false
+indent_func_proto_param         { False, True }
+  Same as indent_func_call_param, but for function protos.
 
-# Same as indent_func_call_param, but for function prototypes.
-indent_func_proto_param         = false    # true/false
+indent_func_class_param         { False, True }
+  Same as indent_func_call_param, but for class declarations.
 
-# Same as indent_func_call_param, but for class declarations.
-indent_func_class_param         = false    # true/false
+indent_func_ctor_var_param      { False, True }
+  Same as indent_func_call_param, but for class variable constructors.
 
-# Same as indent_func_call_param, but for class variable constructors.
-indent_func_ctor_var_param      = false    # true/false
+indent_template_param           { False, True }
+  Same as indent_func_call_param, but for templates.
 
-# Same as indent_func_call_param, but for template parameter lists.
-indent_template_param           = false    # true/false
+indent_func_param_double        { False, True }
+  Double the indent for indent_func_xxx_param options.
+  Use both values of the options indent_columns and indent_param.
 
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
+indent_func_const               Unsigned Number
+  Indentation column for standalone 'const' function decl/proto qualifier.
 
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
+indent_func_throw               Unsigned Number
+  Indentation column for standalone 'throw' function decl/proto qualifier.
 
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
+indent_member                   Unsigned Number
+  The number of spaces to indent a continued '->' or '.'
+  Usually set to 0, 1, or indent_columns.
 
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
+indent_member_single            { False, True }
+  setting to true will indent lines broken at '.' or '->' by a single indent
+  UO_indent_member option will not be effective if this is set to true.
 
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
+indent_sing_line_comments       Unsigned Number
+  Spaces to indent single line ('//') comments on lines before code.
 
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
+indent_relative_single_line_comments { False, True }
+  If set, will indent trailing single line ('//') comments relative
+  to the code instead of trying to keep the same absolute column.
 
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
+indent_switch_case              Unsigned Number
+  Spaces to indent 'case' from 'switch'
+  Usually 0 or indent_columns.
 
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-indent_switch_case              = 0        # unsigned number
+indent_switch_pp                { False, True }
+  Whether to indent preprocessor statements inside of switch statements.
 
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
+indent_case_shift               Unsigned Number
+  Spaces to shift the 'case' line, without affecting any other lines
+  Usually 0.
 
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
+indent_case_brace               Number
+  Spaces to indent '{' from 'case'.
+  By default, the brace will appear under the 'c' in case.
+  Usually set to 0 or indent_columns.
+  negative value are OK.
 
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-indent_case_brace               = 0        # number
+indent_col1_comment             { False, True }
+  Whether to indent comments found in first column.
 
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
+indent_label                    Number
+  How to indent goto labels
+    >0: absolute column where 1 is the leftmost column
+   <=0: subtract from brace indent
+  Default=1
 
-# How to indent goto labels.
-#
-# >0: Absolute column where 1 is the leftmost column
-# ≤0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
+indent_access_spec              Number
+  Same as indent_label, but for access specifiers that are followed by a colon. Default=1
 
-# Same as indent_label, but for access specifiers that are followed by a
-# colon.
-#
-# Default: 1
-indent_access_spec              = 1        # number
+indent_access_spec_body         { False, True }
+  Indent the code after an access specifier by one level.
+  If set, this option forces 'indent_access_spec=0'.
 
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
+indent_paren_nl                 { False, True }
+  If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended).
 
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
+indent_paren_close              Unsigned Number
+  Controls the indent of a close paren after a newline.
+  0: Indent to body level
+  1: Align under the open paren
+  2: Indent to the brace level
 
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
+indent_paren_after_func_def     { False, True }
+  Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren
 
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
+indent_paren_after_func_decl    { False, True }
+  Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren
 
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
+indent_paren_after_func_call    { False, True }
+  Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren
 
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
+indent_comma_paren              { False, True }
+  Controls the indent of a comma when inside a paren.If True, aligns under the open paren.
 
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
+indent_bool_paren               { False, True }
+  Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren.
 
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
+indent_semicolon_for_paren      { False, True }
+  Controls the indent of a semicolon when inside a for paren.If True, aligns under the open for paren.
 
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
+indent_first_bool_expr          { False, True }
+  If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.
 
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
+indent_first_for_expr           { False, True }
+  If 'indent_semicolon_for_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.
 
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
+indent_square_nl                { False, True }
+  If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended).
 
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
+indent_preserve_sql             { False, True }
+  Don't change the relative indent of ESQL/C 'EXEC SQL' bodies.
 
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
+indent_align_assign             { False, True }
+  Align continued statements at the '='. Default=True
+  If False or the '=' is followed by a newline, the next line is indent one tab.
 
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
+indent_align_paren              { False, True }
+  Align continued statements at the '('. Default=True
+  If FALSE or the '(' is not followed by a newline, the next line indent is one tab.
 
-# Whether to align continued statements at the '('. If false or the '(' is not
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
+indent_oc_block                 { False, True }
+  Indent OC blocks at brace level instead of usual rules.
 
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
+indent_oc_block_msg             Unsigned Number
+  Indent OC blocks in a message relative to the parameter name.
+  0=use indent_oc_block rules, 1+=spaces to indent
 
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
+indent_oc_msg_colon             Unsigned Number
+  Minimum indent for subsequent parameters
 
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
+indent_oc_msg_prioritize_first_colon { False, True }
+  If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).
+  Default=True.
 
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
+indent_oc_block_msg_xcode_style { False, True }
+  If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level).
 
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
+indent_oc_block_msg_from_keyword { False, True }
+  If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword.
 
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
+indent_oc_block_msg_from_colon  { False, True }
+  If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon.
 
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
+indent_oc_block_msg_from_caret  { False, True }
+  If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is.
 
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
+indent_oc_block_msg_from_brace  { False, True }
+  If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is.
 
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
+indent_min_vbrace_open          Unsigned Number
+  When indenting after virtual brace open and newline add further spaces to reach this min. indent.
 
-# Whether to add further spaces after regular indent to reach next tabstop
-# when identing after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
+indent_vbrace_open_on_tabstop   { False, True }
+  True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop.
 
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
+indent_token_after_brace        { False, True }
+  If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True.
 
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
+indent_cpp_lambda_body          { False, True }
+  If True, cpp lambda body will be indentedDefault=False.
 
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
+indent_using_block              { False, True }
+  indent (or not) an using block if no braces are used. Only for C#.Default=True.
 
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
+indent_ternary_operator         Unsigned Number
+  indent the continuation of ternary operator.
+  0: (Default) off
+  1: When the `if_false` is a continuation, indent it under `if_false`
+  2: When the `:` is a continuation, indent it under `?`
 
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
+indent_off_after_return_new     { False, True }
+  If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
 
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
+indent_single_after_return      { False, True }
+  If true, the tokens after return are indented with regular single indentation.By default (false) the indentation is after the return token.
 
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
+indent_ignore_asm_block         { False, True }
+  If true, ignore indent and align for asm blocks as they have their own indentation.
 
 #
 # Newline adding and removing options
 #
 
-# Whether to collapse empty blocks between '{' and '}'.
-nl_collapse_empty_body          = false    # true/false
+nl_collapse_empty_body          { False, True }
+  Whether to collapse empty blocks between '{' and '}'.
 
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
+nl_assign_leave_one_liners      { False, True }
+  Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'.
 
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
+nl_class_leave_one_liners       { False, True }
+  Don't split one-line braced statements inside a class xx { } body.
 
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
+nl_enum_leave_one_liners        { False, True }
+  Don't split one-line enums: 'enum foo { BAR = 15 };'
 
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
+nl_getset_leave_one_liners      { False, True }
+  Don't split one-line get or set functions.
 
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
+nl_cs_property_leave_one_liners { False, True }
+  Don't split one-line get or set functions.
 
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-nl_func_leave_one_liners        = false    # true/false
+nl_func_leave_one_liners        { False, True }
+  Don't split one-line function definitions - 'int foo() { return 0; }'.
 
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
+nl_cpp_lambda_leave_one_liners  { False, True }
+  Don't split one-line C++11 lambdas - '[]() { return 0; }'.
 
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
+nl_if_leave_one_liners          { False, True }
+  Don't split one-line if/else statements - 'if(a) b++;'.
 
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
+nl_while_leave_one_liners       { False, True }
+  Don't split one-line while statements - 'while(a) b++;'.
 
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
+nl_for_leave_one_liners         { False, True }
+  Don't split one-line for statements - 'for(...) b++;'.
 
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
+nl_oc_msg_leave_one_liner       { False, True }
+  Don't split one-line OC messages.
 
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+nl_oc_block_brace               { Ignore, Add, Remove, Force }
+  Add or remove newline between Objective-C block signature and '{'.
 
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
+nl_oc_interface_brace           { Ignore, Add, Remove, Force }
+  Add or remove newline between @interface and '{'.
 
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+nl_oc_implementation_brace      { Ignore, Add, Remove, Force }
+  Add or remove newline between @implementation and '{'.
 
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+nl_start_of_file                { Ignore, Add, Remove, Force }
+  Add or remove newlines at the start of the file.
 
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file_min            Unsigned Number
+  The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'.
 
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
+nl_end_of_file                  { Ignore, Add, Remove, Force }
+  Add or remove newline at the end of the file.
 
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file_min              Unsigned Number
+  The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force').
 
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
+nl_assign_brace                 { Ignore, Add, Remove, Force }
+  Add or remove newline between '=' and '{'.
 
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
+nl_assign_square                { Ignore, Add, Remove, Force }
+  Add or remove newline between '=' and '[' (D only).
 
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
+nl_tsquare_brace                { Ignore, Add, Remove, Force }
+  Add or remove newline between '[]' and '{'.
 
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
+nl_after_square_assign          { Ignore, Add, Remove, Force }
+  Add or remove newline after '= [' (D only). Will also affect the newline before the ']'.
 
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
+nl_func_var_def_blk             Unsigned Number
+  The number of blank lines after a block of variable definitions at the top of a function body
+  0 = No change (default).
 
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0 = No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
+nl_typedef_blk_start            Unsigned Number
+  The number of newlines before a block of typedefs
+  0 = No change (default)
+  is overridden by the option 'nl_after_access_spec'.
 
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0 = No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
+nl_typedef_blk_end              Unsigned Number
+  The number of newlines after a block of typedefs
+  0 = No change (default).
 
-# The number of newlines after a block of typedefs.
-#
-# 0 = No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
+nl_typedef_blk_in               Unsigned Number
+  The maximum consecutive newlines within a block of typedefs
+  0 = No change (default).
 
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0 = No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
+nl_var_def_blk_start            Unsigned Number
+  The number of newlines before a block of variable definitions not at the top of a function body
+  0 = No change (default)
+  is overridden by the option 'nl_after_access_spec'.
 
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0 = No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
+nl_var_def_blk_end              Unsigned Number
+  The number of newlines after a block of variable definitions not at the top of a function body
+  0 = No change (default).
 
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0 = No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
+nl_var_def_blk_in               Unsigned Number
+  The maximum consecutive newlines within a block of variable definitions
+  0 = No change (default).
 
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0 = No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
+nl_fcall_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between a function call's ')' and '{', as in:
+  list_for_each(item, &list) { }.
 
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force
+nl_enum_brace                   { Ignore, Add, Remove, Force }
+  Add or remove newline between 'enum' and '{'.
 
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
+nl_enum_class                   { Ignore, Add, Remove, Force }
+  Add or remove newline between 'enum' and 'class'.
 
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
+nl_enum_class_identifier        { Ignore, Add, Remove, Force }
+  Add or remove newline between 'enum class' and the identifier.
 
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+nl_enum_identifier_colon        { Ignore, Add, Remove, Force }
+  Add or remove newline between 'enum class' type and ':'.
 
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+nl_enum_colon_type              { Ignore, Add, Remove, Force }
+  Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'.
 
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
+nl_struct_brace                 { Ignore, Add, Remove, Force }
+  Add or remove newline between 'struct and '{'.
 
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
+nl_union_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between 'union' and '{'.
 
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
+nl_if_brace                     { Ignore, Add, Remove, Force }
+  Add or remove newline between 'if' and '{'.
 
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_brace_else                   { Ignore, Add, Remove, Force }
+  Add or remove newline between '}' and 'else'.
 
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
+nl_elseif_brace                 { Ignore, Add, Remove, Force }
+  Add or remove newline between 'else if' and '{'
+  If set to ignore, nl_if_brace is used instead.
 
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force
+nl_else_brace                   { Ignore, Add, Remove, Force }
+  Add or remove newline between 'else' and '{'.
 
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_if                      { Ignore, Add, Remove, Force }
+  Add or remove newline between 'else' and 'if'.
 
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      { Ignore, Add, Remove, Force }
+  Add or remove newline before 'if'/'else if' closing parenthesis.
 
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_brace_finally                { Ignore, Add, Remove, Force }
+  Add or remove newline between '}' and 'finally'.
 
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
+nl_finally_brace                { Ignore, Add, Remove, Force }
+  Add or remove newline between 'finally' and '{'.
 
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
+nl_try_brace                    { Ignore, Add, Remove, Force }
+  Add or remove newline between 'try' and '{'.
 
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
+nl_getset_brace                 { Ignore, Add, Remove, Force }
+  Add or remove newline between get/set and '{'.
 
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
+nl_for_brace                    { Ignore, Add, Remove, Force }
+  Add or remove newline between 'for' and '{'.
 
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_catch_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between 'catch' and '{'.
 
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
+nl_oc_catch_brace               { Ignore, Add, Remove, Force }
+  Add or remove newline between '@catch' and '{'.
+  If set to ignore, nl_catch_brace is used.
 
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force
+nl_brace_catch                  { Ignore, Add, Remove, Force }
+  Add or remove newline between '}' and 'catch'.
 
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
+nl_oc_brace_catch               { Ignore, Add, Remove, Force }
+  Add or remove newline between '}' and 'catch'.
+  If set to ignore, nl_brace_catch is used.
 
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force
+nl_brace_square                 { Ignore, Add, Remove, Force }
+  Add or remove newline between '}' and ']'.
 
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
+nl_brace_fparen                 { Ignore, Add, Remove, Force }
+  Add or remove newline between '}' and ')' in a function invocation.
 
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
+nl_while_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between 'while' and '{'.
 
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_scope_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between 'scope (x)' and '{' (D).
 
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
+nl_unittest_brace               { Ignore, Add, Remove, Force }
+  Add or remove newline between 'unittest' and '{' (D).
 
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
+nl_version_brace                { Ignore, Add, Remove, Force }
+  Add or remove newline between 'version (x)' and '{' (D).
 
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
+nl_using_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between 'using' and '{'.
 
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
+nl_brace_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between two open or close braces.
+  Due to general newline/brace handling, REMOVE may not work.
 
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force
+nl_do_brace                     { Ignore, Add, Remove, Force }
+  Add or remove newline between 'do' and '{'.
 
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_brace_while                  { Ignore, Add, Remove, Force }
+  Add or remove newline between '}' and 'while' of 'do' statement.
 
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_switch_brace                 { Ignore, Add, Remove, Force }
+  Add or remove newline between 'switch' and '{'.
 
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_synchronized_brace           { Ignore, Add, Remove, Force }
+  Add or remove newline between 'synchronized' and '{'.
 
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
+nl_multi_line_cond              { False, True }
+  Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.
+  Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace.
 
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
+nl_multi_line_define            { False, True }
+  Force a newline in a define after the macro name for multi-line defines.
 
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
+nl_before_case                  { False, True }
+  Whether to put a newline before 'case' statement, not after the first 'case'.
 
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
+nl_before_throw                 { Ignore, Add, Remove, Force }
+  Add or remove newline between ')' and 'throw'.
 
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
+nl_after_case                   { False, True }
+  Whether to put a newline after 'case' statement.
 
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force
+nl_case_colon_brace             { Ignore, Add, Remove, Force }
+  Add or remove a newline between a case ':' and '{'. Overrides nl_after_case.
 
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
+nl_namespace_brace              { Ignore, Add, Remove, Force }
+  Newline between namespace and {.
 
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
+nl_template_class               { Ignore, Add, Remove, Force }
+  Add or remove newline between 'template<>' and whatever follows.
 
-# Add or remove newline between 'template<>' and whatever follows.
-nl_template_class               = ignore   # ignore/add/remove/force
+nl_class_brace                  { Ignore, Add, Remove, Force }
+  Add or remove newline between 'class' and '{'.
 
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
+nl_class_init_args              { Ignore, Add, Remove, Force }
+  Add or remove newline before/after each ',' in the base class list,
+    (tied to pos_class_comma).
 
-# Add or remove newline before or after (depending on pos_class_comma) each
-# ',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
+nl_constr_init_args             { Ignore, Add, Remove, Force }
+  Add or remove newline after each ',' in the constructor member initialization.
+  Related to nl_constr_colon, pos_constr_colon and pos_constr_comma.
 
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force
+nl_enum_own_lines               { Ignore, Add, Remove, Force }
+  Add or remove newline before first element, after comma, and after last element in enum.
 
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force
+nl_func_type_name               { Ignore, Add, Remove, Force }
+  Add or remove newline between return type and function name in a function definition.
 
-# Add or remove newline between return type and function name in a function
-# definition.
-nl_func_type_name               = ignore   # ignore/add/remove/force
+nl_func_type_name_class         { Ignore, Add, Remove, Force }
+  Add or remove newline between return type and function name inside a class {}
+  Uses nl_func_type_name or nl_func_proto_type_name if set to ignore.
 
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force
+nl_func_class_scope             { Ignore, Add, Remove, Force }
+  Add or remove newline between class specification and '::' in 'void A::f() { }'
+  Only appears in separate member implementation (does not appear with in-line implmementation).
 
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force
+nl_func_scope_name              { Ignore, Add, Remove, Force }
+  Add or remove newline between function scope and name
+  Controls the newline after '::' in 'void A::f() { }'.
 
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force
+nl_func_proto_type_name         { Ignore, Add, Remove, Force }
+  Add or remove newline between return type and function name in a prototype.
 
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force
+nl_func_paren                   { Ignore, Add, Remove, Force }
+  Add or remove newline between a function name and the opening '(' in the declaration.
 
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force
+nl_func_paren_empty             { Ignore, Add, Remove, Force }
+  Overrides nl_func_paren for functions with no parameters.
 
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
+nl_func_def_paren               { Ignore, Add, Remove, Force }
+  Add or remove newline between a function name and the opening '(' in the definition.
 
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force
+nl_func_def_paren_empty         { Ignore, Add, Remove, Force }
+  Overrides nl_func_def_paren for functions with no parameters.
 
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+nl_func_call_paren              { Ignore, Add, Remove, Force }
+  Add or remove newline between a function name and the opening '(' in the call
 
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force
+nl_func_call_paren_empty        { Ignore, Add, Remove, Force }
+  Overrides nl_func_call_paren for functions with no parameters.
 
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+nl_func_decl_start              { Ignore, Add, Remove, Force }
+  Add or remove newline after '(' in a function declaration.
 
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
+nl_func_def_start               { Ignore, Add, Remove, Force }
+  Add or remove newline after '(' in a function definition.
 
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
+nl_func_decl_start_single       { Ignore, Add, Remove, Force }
+  Overrides nl_func_decl_start when there is only one parameter.
 
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+nl_func_def_start_single        { Ignore, Add, Remove, Force }
+  Overrides nl_func_def_start when there is only one parameter.
 
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
+nl_func_decl_start_multi_line   { False, True }
+  Whether to add newline after '(' in a function declaration if '(' and ')' are in different lines.
 
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
+nl_func_def_start_multi_line    { False, True }
+  Whether to add newline after '(' in a function definition if '(' and ')' are in different lines.
 
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
+nl_func_decl_args               { Ignore, Add, Remove, Force }
+  Add or remove newline after each ',' in a function declaration.
 
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
+nl_func_def_args                { Ignore, Add, Remove, Force }
+  Add or remove newline after each ',' in a function definition.
 
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
+nl_func_decl_args_multi_line    { False, True }
+  Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines.
 
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
+nl_func_def_args_multi_line     { False, True }
+  Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines.
 
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
+nl_func_decl_end                { Ignore, Add, Remove, Force }
+  Add or remove newline before the ')' in a function declaration.
 
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_def_end                 { Ignore, Add, Remove, Force }
+  Add or remove newline before the ')' in a function definition.
 
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_decl_end_single         { Ignore, Add, Remove, Force }
+  Overrides nl_func_decl_end when there is only one parameter.
 
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+nl_func_def_end_single          { Ignore, Add, Remove, Force }
+  Overrides nl_func_def_end when there is only one parameter.
 
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
+nl_func_decl_end_multi_line     { False, True }
+  Whether to add newline before ')' in a function declaration if '(' and ')' are in different lines.
 
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
+nl_func_def_end_multi_line      { False, True }
+  Whether to add newline before ')' in a function definition if '(' and ')' are in different lines.
 
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
+nl_func_decl_empty              { Ignore, Add, Remove, Force }
+  Add or remove newline between '()' in a function declaration.
 
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_def_empty               { Ignore, Add, Remove, Force }
+  Add or remove newline between '()' in a function definition.
 
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_call_empty              { Ignore, Add, Remove, Force }
+  Add or remove newline between '()' in a function call.
 
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_start_multi_line   { False, True }
+  Whether to add newline after '(' in a function call if '(' and ')' are in different lines.
 
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
+nl_func_call_args_multi_line    { False, True }
+  Whether to add newline after each ',' in a function call if '(' and ')' are in different lines.
 
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
+nl_func_call_end_multi_line     { False, True }
+  Whether to add newline before ')' in a function call if '(' and ')' are in different lines.
 
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
+nl_oc_msg_args                  { False, True }
+  Whether to put each OC message parameter on a separate line
+  See nl_oc_msg_leave_one_liner.
 
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
+nl_fdef_brace                   { Ignore, Add, Remove, Force }
+  Add or remove newline between function signature and '{'.
 
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
+nl_cpp_ldef_brace               { Ignore, Add, Remove, Force }
+  Add or remove newline between C++11 lambda signature and '{'.
 
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+nl_return_expr                  { Ignore, Add, Remove, Force }
+  Add or remove a newline between the return keyword and return expression.
 
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_after_semicolon              { False, True }
+  Whether to put a newline after semicolons, except in 'for' statements.
 
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
+nl_paren_dbrace_open            { Ignore, Add, Remove, Force }
+  Java: Control the newline between the ')' and '{{' of the double brace initializer.
 
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+nl_type_brace_init_lst          { Ignore, Add, Remove, Force }
+  Whether to put a newline after the type in an unnamed temporary direct-list-initialization.
 
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force
+nl_type_brace_init_lst_open     { Ignore, Add, Remove, Force }
+  Whether to put a newline after open brace in an unnamed temporary direct-list-initialization.
 
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force
+nl_type_brace_init_lst_close    { Ignore, Add, Remove, Force }
+  Whether to put a newline before close brace in an unnamed temporary direct-list-initialization.
 
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force
+nl_after_brace_open             { False, True }
+  Whether to put a newline after brace open.
+  This also adds a newline before the matching brace close.
 
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
+nl_after_brace_open_cmt         { False, True }
+  If nl_after_brace_open and nl_after_brace_open_cmt are True, a newline is
+  placed between the open brace and a trailing single-line comment.
 
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
+nl_after_vbrace_open            { False, True }
+  Whether to put a newline after a virtual brace open with a non-empty body.
+  These occur in un-braced if/while/do/for statement bodies.
 
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
+nl_after_vbrace_open_empty      { False, True }
+  Whether to put a newline after a virtual brace open with an empty body.
+  These occur in un-braced if/while/do/for statement bodies.
 
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
+nl_after_brace_close            { False, True }
+  Whether to put a newline after a brace close.
+  Does not apply if followed by a necessary ';'.
 
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
+nl_after_vbrace_close           { False, True }
+  Whether to put a newline after a virtual brace close.
+  Would add a newline before return in: 'if (foo) a++; return;'.
 
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
+nl_brace_struct_var             { Ignore, Add, Remove, Force }
+  Control the newline between the close brace and 'b' in: 'struct { int a; } b;'
+  Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close.
 
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_define_macro                 { False, True }
+  Whether to alter newlines in '#define' macros.
 
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
+nl_squeeze_paren_close          { False, True }
+  Whether to alter newlines between consecutive paren closes, 
+  The number of closing paren in a line will depend on respective open paren lines
 
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
+nl_squeeze_ifdef                { False, True }
+  Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs.
 
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
+nl_squeeze_ifdef_top_level      { False, True }
+  Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
 
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
+nl_before_if                    { Ignore, Add, Remove, Force }
+  Add or remove blank line before 'if'.
 
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
+nl_after_if                     { Ignore, Add, Remove, Force }
+  Add or remove blank line after 'if' statement.
+  Add/Force work only if the next token is not a closing brace.
 
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force
+nl_before_for                   { Ignore, Add, Remove, Force }
+  Add or remove blank line before 'for'.
 
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
+nl_after_for                    { Ignore, Add, Remove, Force }
+  Add or remove blank line after 'for' statement.
 
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
+nl_before_while                 { Ignore, Add, Remove, Force }
+  Add or remove blank line before 'while'.
 
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
+nl_after_while                  { Ignore, Add, Remove, Force }
+  Add or remove blank line after 'while' statement.
 
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
+nl_before_switch                { Ignore, Add, Remove, Force }
+  Add or remove blank line before 'switch'.
 
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
+nl_after_switch                 { Ignore, Add, Remove, Force }
+  Add or remove blank line after 'switch' statement.
 
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
+nl_before_synchronized          { Ignore, Add, Remove, Force }
+  Add or remove blank line before 'synchronized'.
 
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
+nl_after_synchronized           { Ignore, Add, Remove, Force }
+  Add or remove blank line after 'synchronized' statement.
 
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
+nl_before_do                    { Ignore, Add, Remove, Force }
+  Add or remove blank line before 'do'.
 
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
+nl_after_do                     { Ignore, Add, Remove, Force }
+  Add or remove blank line after 'do/while' statement.
 
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
+nl_ds_struct_enum_cmt           { False, True }
+  Whether to double-space commented-entries in struct/union/enum.
 
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
+nl_ds_struct_enum_close_brace   { False, True }
+  force nl before } of a struct/union/enum
+  (lower priority than 'eat_blanks_before_close_brace').
 
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
+nl_before_func_class_def        Unsigned Number
+  Add or remove blank line before 'func_class_def'.
 
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force
+nl_before_func_class_proto      Unsigned Number
+  Add or remove blank line before 'func_class_proto'.
 
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force
+nl_class_colon                  { Ignore, Add, Remove, Force }
+  Add or remove a newline before/after a class colon,
+    (tied to pos_class_colon).
 
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
+nl_constr_colon                 { Ignore, Add, Remove, Force }
+  Add or remove a newline around a class constructor colon.
+  Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma.
 
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' → 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
+nl_namespace_two_to_one_liner   { False, True }
+  If true turns two liner namespace to one liner,else will make then four liners
 
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' → 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
+nl_create_if_one_liner          { False, True }
+  Change simple unbraced if statements into a one-liner
+  'if(b)\n i++;' => 'if(b) i++;'.
 
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' → 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
+nl_create_for_one_liner         { False, True }
+  Change simple unbraced for statements into a one-liner
+  'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'.
 
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
+nl_create_while_one_liner       { False, True }
+  Change simple unbraced while statements into a one-liner
+  'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'.
 
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
+nl_create_func_def_one_liner    { False, True }
+  Change simple 4,3,2 liner function def statements into a one-liner
+  
 
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
+nl_split_if_one_liner           { False, True }
+   Change a one-liner if statement into simple unbraced if
+  'if(b) i++;' => 'if(b)\n i++;'.
 
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
+nl_split_for_one_liner          { False, True }
+  Change a one-liner for statement into simple unbraced for
+  'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'.
+
+nl_split_while_one_liner        { False, True }
+  Change a one-liner while statement into simple unbraced while
+  'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'.
 
 #
 # Blank line options
 #
 
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
+nl_max                          Unsigned Number
+  The maximum consecutive newlines (3 = 2 blank lines).
 
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
+nl_max_blank_in_func            Unsigned Number
+  The maximum consecutive newlines in function.
 
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
+nl_after_func_proto             Unsigned Number
+  The number of newlines after a function prototype, if followed by another function prototype.
 
-# The number of newlines before a multi-line function definition.
-nl_before_func_body_def         = 0        # unsigned number
+nl_after_func_proto_group       Unsigned Number
+  The number of newlines after a function prototype, if not followed by another function prototype.
 
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
+nl_after_func_class_proto       Unsigned Number
+  The number of newlines after a function class prototype, if followed by another function class prototype.
 
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
+nl_after_func_class_proto_group Unsigned Number
+  The number of newlines after a function class prototype, if not followed by another function class prototype.
 
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
+nl_before_func_body_def         Unsigned Number
+  The number of newlines before a multi-line function def body.
 
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
+nl_before_func_body_proto       Unsigned Number
+  The number of newlines before a multi-line function prototype body.
 
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
+nl_after_func_body              Unsigned Number
+  The number of newlines after '}' of a multi-line function body.
 
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
+nl_after_func_body_class        Unsigned Number
+  The number of newlines after '}' of a multi-line function body in a class declaration.
 
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
+nl_after_func_body_one_liner    Unsigned Number
+  The number of newlines after '}' of a single line function body.
 
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
+nl_before_block_comment         Unsigned Number
+  The minimum number of newlines before a multi-line comment.
+  Doesn't apply if after a brace open or another multi-line comment.
 
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
+nl_before_c_comment             Unsigned Number
+  The minimum number of newlines before a single-line C comment.
+  Doesn't apply if after a brace open or other single-line C comments.
 
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
+nl_before_cpp_comment           Unsigned Number
+  The minimum number of newlines before a CPP comment.
+  Doesn't apply if after a brace open or other CPP comments.
 
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
+nl_after_multiline_comment      { False, True }
+  Whether to force a newline after a multi-line comment.
 
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
+nl_after_label_colon            { False, True }
+  Whether to force a newline after a label's colon.
 
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
+nl_after_struct                 Unsigned Number
+  The number of newlines after '}' or ';' of a struct/enum/union definition.
 
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
+nl_before_class                 Unsigned Number
+  The number of newlines before a class definition.
 
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
+nl_after_class                  Unsigned Number
+  The number of newlines after '}' or ';' of a class definition.
 
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
+nl_before_access_spec           Unsigned Number
+  The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
+  Will not change the newline count if after a brace open.
+  0 = No change.
 
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
+nl_after_access_spec            Unsigned Number
+  The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.
+  0 = No change.
+  Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'.
 
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
+nl_comment_func_def             Unsigned Number
+  The number of newlines between a function def and the function comment.
+  0 = No change.
 
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0 = No change (default).
-nl_before_access_spec           = 0        # unsigned number
+nl_after_try_catch_finally      Unsigned Number
+  The number of newlines after a try-catch-finally block that isn't followed by a brace close.
+  0 = No change.
 
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0 = No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
+nl_around_cs_property           Unsigned Number
+  The number of newlines before and after a property, indexer or event decl.
+  0 = No change.
 
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0 = No change (default).
-nl_comment_func_def             = 0        # unsigned number
+nl_between_get_set              Unsigned Number
+  The number of newlines between the get/set/add/remove handlers in C#.
+  0 = No change.
 
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0 = No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
+nl_property_brace               { Ignore, Add, Remove, Force }
+  Add or remove newline between C# property and the '{'.
 
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0 = No change (default).
-nl_around_cs_property           = 0        # unsigned number
+eat_blanks_after_open_brace     { False, True }
+  Whether to remove blank lines after '{'.
 
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0 = No change (default).
-nl_between_get_set              = 0        # unsigned number
+eat_blanks_before_close_brace   { False, True }
+  Whether to remove blank lines before '}'.
 
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
+nl_remove_extra_newlines        Unsigned Number
+  How aggressively to remove extra newlines not in preproc.
+  0: No change
+  1: Remove most newlines not handled by other config
+  2: Remove all newlines and reformat completely by config
 
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0 = Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
+nl_before_return                { False, True }
+  Whether to put a blank line before 'return' statements, unless after an open brace.
 
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
+nl_after_return                 { False, True }
+  Whether to put a blank line after 'return' statements, unless followed by a close brace.
 
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
+nl_after_annotation             { Ignore, Add, Remove, Force }
+  Whether to put a newline after a Java annotation statement.
+  Only affects annotations that are after a newline.
 
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
+nl_between_annotation           { Ignore, Add, Remove, Force }
+  Controls the newline between two annotations.
 
 #
 # Positioning options
 #
 
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_arith                       { Ignore, Lead, Trail }
+  The position of arithmetic operators in wrapped expressions.
 
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_assign                      { Ignore, Lead, Trail }
+  The position of assignment in wrapped expressions.
+  Do not affect '=' followed by '{'.
 
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_bool                        { Ignore, Lead, Trail }
+  The position of boolean operators in wrapped expressions.
 
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_compare                     { Ignore, Lead, Trail }
+  The position of comparison operators in wrapped expressions.
 
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_conditional                 { Ignore, Lead, Trail }
+  The position of conditional (b ? t : f) operators in wrapped expressions.
 
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_comma                       { Ignore, Lead, Trail }
+  The position of the comma in wrapped expressions.
 
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_enum_comma                  { Ignore, Lead, Trail }
+  The position of the comma in enum entries.
 
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_class_comma                 { Ignore, Lead, Trail }
+  The position of the comma in the base class list if there are more than one line,
+    (tied to nl_class_init_args).
 
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_comma                { Ignore, Lead, Trail }
+  The position of the comma in the constructor initialization list.
+  Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
 
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_class_colon                 { Ignore, Lead, Trail }
+  The position of trailing/leading class colon, between class and base class list
+    (tied to nl_class_colon).
 
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_colon                { Ignore, Lead, Trail }
+  The position of colons between constructor and member initialization,
+  (tied to nl_constr_colon).
+  Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
 
 #
-# Line splitting options
+# Line Splitting options
 #
 
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
+code_width                      Unsigned Number
+  Try to limit code width to N number of columns
 
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
+ls_for_split_full               { False, True }
+  Whether to fully split long 'for' statements at semi-colons.
 
-# Whether to fully split long function prototypes/calls at commas.
-ls_func_split_full              = false    # true/false
+ls_func_split_full              { False, True }
+  Whether to fully split long function protos/calls at commas.
 
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-ls_code_width                   = false    # true/false
+ls_code_width                   { False, True }
+  Whether to split lines as close to code_width as possible and ignore some groupings.
 
 #
-# Code alignment options (not left column spaces/tabs)
+# Code alignment (not left column spaces/tabs)
 #
 
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
+align_keep_tabs                 { False, True }
+  Whether to keep non-indenting tabs.
 
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
+align_with_tabs                 { False, True }
+  Whether to use tabs for aligning.
 
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
+align_on_tabstop                { False, True }
+  Whether to bump out to the next tab when aligning.
 
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
+align_number_right              { False, True }
+  Whether to right-align numbers.
 
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
+align_keep_extra_space          { False, True }
+  Whether to keep whitespace not required for alignment.
 
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
+align_func_params               { False, True }
+  Align variable definitions in prototypes and functions.
 
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0 = Don't align (default).
-align_func_params_span          = 0        # unsigned number
+align_func_params_span          Unsigned Number
+  The span for aligning parameter definitions in function on parameter name (0=don't align).
 
-# The threshold for aligning function parameter definitions.
-#
-# 0 = No limit (default).
-align_func_params_thresh        = 0        # unsigned number
+align_func_params_thresh        Unsigned Number
+  The threshold for aligning function parameter definitions (0=no limit).
 
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
+align_func_params_gap           Unsigned Number
+  The gap for aligning function parameter definitions.
 
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
+align_same_func_call_params     { False, True }
+  Align parameters in single-line functions that have the same name.
+  The function names must already be aligned with each other.
 
-# The span for aligning function-call parameters for single line functions.
-#
-# 0 = Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
+align_same_func_call_params_span       Unsigned Number
+  The span for function call parameter alignment (0=don't align)
 
-# The threshold for aligning function-call parameters for single line
-# functions.
-#
-# 0 = No limit (default).
-align_same_func_call_params_thresh = 0        # unsigned number
+align_same_func_call_params_thresh            Unsigned Number
+  The threshold for function call parameter alignment (0=no limit)
 
-# The span for aligning variable definitions.
-#
-# 0 = Don't align (default).
-align_var_def_span              = 0        # unsigned number
+align_var_def_span              Unsigned Number
+  The span for aligning variable definitions (0=don't align)
 
-# How to align the '*' in variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-align_var_def_star_style        = 0        # unsigned number
+align_var_def_star_style        Unsigned Number
+  How to align the star in variable definitions.
+   0=Part of the type     'void *   foo;'
+   1=Part of the variable 'void     *foo;'
+   2=Dangling             'void    *foo;'
 
-# How to align the '&' in variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-align_var_def_amp_style         = 0        # unsigned number
+align_var_def_amp_style         Unsigned Number
+  How to align the '&' in variable definitions.
+   0=Part of the type
+   1=Part of the variable
+   2=Dangling
 
-# The threshold for aligning variable definitions.
-#
-# 0 = No limit (default).
-align_var_def_thresh            = 0        # unsigned number
+align_var_def_thresh            Unsigned Number
+  The threshold for aligning variable definitions (0=no limit)
 
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
+align_var_def_gap               Unsigned Number
+  The gap for aligning variable definitions.
 
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
+align_var_def_colon             { False, True }
+  Whether to align the colon in struct bit fields.
 
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
+align_var_def_colon_gap         Unsigned Number
+  align variable defs gap for bit colons.
 
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
+align_var_def_attribute         { False, True }
+  Whether to align any attribute after the variable name.
 
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
+align_var_def_inline            { False, True }
+  Whether to align inline struct/enum/union variable definitions.
 
-# The span for aligning on '=' in assignments.
-#
-# 0 = Don't align (default).
-align_assign_span               = 0        # unsigned number
+align_assign_span               Unsigned Number
+  The span for aligning on '=' in assignments (0=don't align)
 
-# The threshold for aligning on '=' in assignments.
-#
-# 0 = No limit (default).
-align_assign_thresh             = 0        # unsigned number
+align_assign_thresh             Unsigned Number
+  The threshold for aligning on '=' in assignments (0=no limit)
 
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
+align_enum_equ_span             Unsigned Number
+  The span for aligning on '=' in enums (0=don't align)
 
-# The span for aligning on '=' in enums.
-#
-# 0 = Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
+align_enum_equ_thresh           Unsigned Number
+  The threshold for aligning on '=' in enums (0=no limit)
 
-# The threshold for aligning on '=' in enums.
-#
-# 0 = no limit (default).
-align_enum_equ_thresh           = 0        # unsigned number
+align_var_class_span            Unsigned Number
+  The span for aligning class (0=don't align)
 
-# The span for aligning class member definitions.
-#
-# 0 = Don't align (default).
-align_var_class_span            = 0        # unsigned number
+align_var_class_thresh          Unsigned Number
+  The threshold for aligning class member definitions (0=no limit).
 
-# The threshold for aligning class member definitions.
-#
-# 0 = No limit (default).
-align_var_class_thresh          = 0        # unsigned number
+align_var_class_gap             Unsigned Number
+  The gap for aligning class member definitions.
 
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
+align_var_struct_span           Unsigned Number
+  The span for aligning struct/union (0=don't align)
 
-# The span for aligning struct/union member definitions.
-#
-# 0 = Don't align (default).
-align_var_struct_span           = 0        # unsigned number
+align_var_struct_thresh         Unsigned Number
+  The threshold for aligning struct/union member definitions (0=no limit)
 
-# The threshold for aligning struct/union member definitions.
-#
-# 0 = No limit (default).
-align_var_struct_thresh         = 0        # unsigned number
+align_var_struct_gap            Unsigned Number
+  The gap for aligning struct/union member definitions.
 
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
+align_struct_init_span          Unsigned Number
+  The span for aligning struct initializer values (0=don't align)
 
-# The span for aligning struct initializer values.
-#
-# 0 = Don't align (default).
-align_struct_init_span          = 0        # unsigned number
+align_typedef_gap               Unsigned Number
+  The minimum space between the type and the synonym of a typedef.
 
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
+align_typedef_span              Unsigned Number
+  The span for aligning single-line typedefs (0=don't align).
 
-# The span for aligning single-line typedefs.
-#
-# 0 = Don't align (default).
-align_typedef_span              = 0        # unsigned number
+align_typedef_func              Unsigned Number
+  How to align typedef'd functions with other typedefs
+  0: Don't mix them at all
+  1: align the open paren with the types
+  2: align the function type name with the other type names
 
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
+align_typedef_star_style        Unsigned Number
+  Controls the positioning of the '*' in typedefs. Just try it.
+  0: Align on typedef type, ignore '*'
+  1: The '*' is part of type name: typedef int  *pint;
+  2: The '*' is part of the type, but dangling: typedef int *pint;
 
-# How to align the '*' in typedefs.
-#
-# 0: Align on typedef type, ignore '*' (default)
-# 1: The '*' is part of type name: 'typedef int  *pint;'
-# 2: The '*' is part of the type, but dangling: 'typedef int *pint;'
-align_typedef_star_style        = 0        # unsigned number
+align_typedef_amp_style         Unsigned Number
+  Controls the positioning of the '&' in typedefs. Just try it.
+  0: Align on typedef type, ignore '&'
+  1: The '&' is part of type name: typedef int  &pint;
+  2: The '&' is part of the type, but dangling: typedef int &pint;
 
-# How to align the '&' in typedefs.
-#
-# 0: Align on typedef type, ignore '&' (default)
-# 1: The '&' is part of type name: 'typedef int  &pint;'
-# 2: The '&' is part of the type, but dangling: 'typedef int &pint;'
-align_typedef_amp_style         = 0        # unsigned number
+align_right_cmt_span            Unsigned Number
+  The span for aligning comments that end lines (0=don't align)
 
-# The span for aligning comments that end lines.
-#
-# 0 = Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
+align_right_cmt_mix             { False, True }
+  If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment.
 
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
+align_right_cmt_gap             Unsigned Number
+  If a trailing comment is more than this number of columns away from the text it follows,
+  it will qualify for being aligned. This has to be > 0 to do anything.
 
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
+align_right_cmt_at_col          Unsigned Number
+  Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore)
 
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
+align_func_proto_span           Unsigned Number
+  The span for aligning function prototypes (0=don't align).
 
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0 = Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
+align_func_proto_gap            Unsigned Number
+  Minimum gap between the return type and the function name.
 
-# The span for aligning function prototypes.
-#
-# 0 = Don't align (default).
-align_func_proto_span           = 0        # unsigned number
+align_on_operator               { False, True }
+  Align function protos on the 'operator' keyword instead of what follows.
 
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
+align_mix_var_proto             { False, True }
+  Whether to mix aligning prototype and variable declarations.
+  If True, align_var_def_XXX options are used instead of align_func_proto_XXX options.
 
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
+align_single_line_func          { False, True }
+  Align single-line functions with function prototypes, uses align_func_proto_span.
 
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
+align_single_line_brace         { False, True }
+  Aligning the open brace of single-line functions.
+  Requires align_single_line_func=True, uses align_func_proto_span.
 
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
+align_single_line_brace_gap     Unsigned Number
+  Gap for align_single_line_brace.
 
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
+align_oc_msg_spec_span          Unsigned Number
+  The span for aligning ObjC msg spec (0=don't align)
 
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
+align_nl_cont                   { False, True }
+  Whether to align macros wrapped with a backslash and a newline.
+  This will not work right if the macro contains a multi-line comment.
 
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0 = Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
+align_pp_define_together        { False, True }
+  # Align macro functions and variables together.
 
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
+align_pp_define_gap             Unsigned Number
+  The minimum space between label and value of a preprocessor define.
 
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
+align_pp_define_span            Unsigned Number
+  The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks)
 
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
+align_left_shift                { False, True }
+  Align lines that start with '<<' with previous '<<'. Default=True.
 
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
+align_asm_colon                 { False, True }
+  Align text after asm volatile () colons.
 
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0 = Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
+align_oc_msg_colon_span         Unsigned Number
+  Span for aligning parameters in an Obj-C message call on the ':' (0=don't align)
 
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
+align_oc_msg_colon_first        { False, True }
+  If True, always align with the first parameter, even if it is too short.
 
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
+align_oc_decl_colon             { False, True }
+  Aligning parameters in an Obj-C '+' or '-' declaration on the ':'.
 
 #
-# Comment modification options
+# Comment modifications
 #
 
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
+cmt_width                       Unsigned Number
+  Try to wrap comments at cmt_width columns
 
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow
-cmt_reflow_mode                 = 0        # unsigned number
+cmt_reflow_mode                 Unsigned Number
+  Set the comment reflow mode (Default=0)
+  0: no reflowing (apart from the line wrapping due to cmt_width)
+  1: no touching at all
+  2: full reflow
 
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
+cmt_convert_tab_to_spaces       { False, True }
+  Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting.
 
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
+cmt_indent_multi                { False, True }
+  If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars.
+  Default=True.
 
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
+cmt_c_group                     { False, True }
+  Whether to group c-comments that look like they are in a block.
 
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
+cmt_c_nl_start                  { False, True }
+  Whether to put an empty '/*' on the first line of the combined c-comment.
 
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
+cmt_c_nl_end                    { False, True }
+  Whether to put a newline before the closing '*/' of the combined c-comment.
 
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
+cmt_cpp_group                   { False, True }
+  Whether to group cpp-comments that look like they are in a block.
 
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
+cmt_cpp_nl_start                { False, True }
+  Whether to put an empty '/*' on the first line of the combined cpp-comment.
 
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
+cmt_cpp_nl_end                  { False, True }
+  Whether to put a newline before the closing '*/' of the combined cpp-comment.
 
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
+cmt_cpp_to_c                    { False, True }
+  Whether to change cpp-comments into c-comments.
 
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
+cmt_star_cont                   { False, True }
+  Whether to put a star on subsequent comment lines.
 
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
+cmt_sp_before_star_cont         Unsigned Number
+  The number of spaces to insert at the start of subsequent comment lines.
 
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
+cmt_sp_after_star_cont          Number
+  The number of spaces to insert after the star on subsequent comment lines.
 
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
+cmt_multi_check_last            { False, True }
+  For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+  the comment are the same length. Default=True.
 
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
+cmt_multi_first_len_minimum     Unsigned Number
+  For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+  the comment are the same length AND if the length is bigger as the first_len minimum. Default=4
 
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
+cmt_insert_file_header          String
+  The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.
+  Will substitute $(filename) with the current file's name.
 
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
+cmt_insert_file_footer          String
+  The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.
+  Will substitute $(filename) with the current file's name.
 
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
+cmt_insert_func_header          String
+  The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
+  Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
+  Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }.
 
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
+cmt_insert_class_header         String
+  The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.
+  Will substitute $(class) with the class name.
 
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
+cmt_insert_oc_msg_header        String
+  The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment.
+  Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.
 
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
+cmt_insert_before_preproc       { False, True }
+  If a preprocessor is encountered when stepping backwards from a function name, then
+  this option decides whether the comment should be inserted.
+  Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header.
 
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
+cmt_insert_before_inlines       { False, True }
+  If a function is declared inline to a class definition, then
+  this option decides whether the comment should be inserted.
+  Affects cmt_insert_func_header.
 
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
+cmt_insert_before_ctor_dtor     { False, True }
+  If the function is a constructor/destructor, then
+  this option decides whether the comment should be inserted.
+  Affects cmt_insert_func_header.
 
 #
 # Code modifying options (non-whitespace)
 #
 
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
+mod_full_brace_do               { Ignore, Add, Remove, Force }
+  Add or remove braces on single-line 'do' statement.
 
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
+mod_full_brace_for              { Ignore, Add, Remove, Force }
+  Add or remove braces on single-line 'for' statement.
 
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force
+mod_full_brace_function         { Ignore, Add, Remove, Force }
+  Add or remove braces on single-line function definitions. (Pawn).
 
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
+mod_full_brace_if               { Ignore, Add, Remove, Force }
+  Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
 
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
+mod_full_brace_if_chain         { False, True }
+  Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
+  If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
 
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
+mod_full_brace_if_chain_only    { False, True }
+  Make all if/elseif/else statements with at least one 'else' or 'else if' fully braced.
+  If mod_full_brace_if_chain is used together with this option, all if-else chains will get braces,
+  and simple 'if' statements will lose them (if possible).
 
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
+mod_full_brace_nl               Unsigned Number
+  Don't remove braces around statements that span N newlines
 
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
+mod_full_brace_nl_block_rem_mlcond { False, True }
+  Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines.
 
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
+mod_full_brace_while            { Ignore, Add, Remove, Force }
+  Add or remove braces on single-line 'while' statement.
 
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_full_brace_using            { Ignore, Add, Remove, Force }
+  Add or remove braces on single-line 'using ()' statement.
 
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
+mod_paren_on_return             { Ignore, Add, Remove, Force }
+  Add or remove unnecessary paren on 'return' statement.
 
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' → 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
+mod_pawn_semicolon              { False, True }
+  Whether to change optional semicolons to real semicolons.
 
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
+mod_full_paren_if_bool          { False, True }
+  Add parens on 'while' and 'if' statement around bools.
 
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
+mod_remove_extra_semicolon      { False, True }
+  Whether to remove superfluous semicolons.
 
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
+mod_add_long_function_closebrace_comment Unsigned Number
+  If a function body exceeds the specified number of newlines and doesn't have a comment after
+  the close brace, a comment will be added.
 
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
+mod_add_long_namespace_closebrace_comment Unsigned Number
+  If a namespace body exceeds the specified number of newlines and doesn't have a comment after
+  the close brace, a comment will be added.
 
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
+mod_add_long_class_closebrace_comment Unsigned Number
+  If a class body exceeds the specified number of newlines and doesn't have a comment after
+  the close brace, a comment will be added.
 
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
+mod_add_long_switch_closebrace_comment Unsigned Number
+  If a switch body exceeds the specified number of newlines and doesn't have a comment after
+  the close brace, a comment will be added.
 
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
+mod_add_long_ifdef_endif_comment Unsigned Number
+  If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after
+  the #endif, a comment will be added.
 
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
+mod_add_long_ifdef_else_comment Unsigned Number
+  If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after
+  the #else, a comment will be added.
 
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
+mod_sort_import                 { False, True }
+  If True, will sort consecutive single-line 'import' statements [Java, D].
 
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
+mod_sort_using                  { False, True }
+  If True, will sort consecutive single-line 'using' statements [C#].
 
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' → 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
+mod_sort_include                { False, True }
+  If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]
+  This is generally a bad idea, as it may break your code.
 
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force
+mod_move_case_break             { False, True }
+  If True, it will move a 'break' that appears after a fully braced 'case' before the close brace.
 
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
+mod_case_brace                  { Ignore, Add, Remove, Force }
+  Will add or remove the braces around a fully braced case statement.
+  Will only remove the braces if there are no variable declarations in the block.
 
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force
+mod_remove_empty_return         { False, True }
+  If True, it will remove a void 'return;' that appears as the last statement in a function.
 
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
+mod_sort_oc_properties          { False, True }
+  If True, it will organize the properties (Obj-C).
 
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
+mod_sort_oc_property_class_weight Number
+  Determines weight of class property modifier (Obj-C).
 
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
+mod_sort_oc_property_thread_safe_weight Number
+  Determines weight of atomic, nonatomic (Obj-C).
 
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
+mod_sort_oc_property_readwrite_weight Number
+  Determines weight of readwrite (Obj-C).
 
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
+mod_sort_oc_property_reference_weight Number
+  Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C).
 
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
+mod_sort_oc_property_getter_weight Number
+  Determines weight of getter type (getter=) (Obj-C).
 
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
+mod_sort_oc_property_setter_weight Number
+  Determines weight of setter type (setter=) (Obj-C).
 
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
+mod_sort_oc_property_nullability_weight Number
+  Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C).
 
 #
 # Preprocessor options
 #
 
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force
+pp_indent                       { Ignore, Add, Remove, Force }
+  Control indent of preprocessors inside #if blocks at brace level 0 (file-level).
 
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
+pp_indent_at_level              { False, True }
+  Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False).
 
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
+pp_indent_count                 Unsigned Number
+  Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
+  If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
+  Default=1.
 
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force
+pp_space                        { Ignore, Add, Remove, Force }
+  Add or remove space after # based on pp_level of #if blocks.
 
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
+pp_space_count                  Unsigned Number
+  Sets the number of spaces added with pp_space.
 
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
+pp_indent_region                Number
+  The indent for #region and #endregion in C# and '#pragma region' in C/C++.
 
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
+pp_region_indent_code           { False, True }
+  Whether to indent the code between #region and #endregion.
 
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
+pp_indent_if                    Number
+  If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level.
+  0:  indent preprocessors using output_tab_size.
+  >0: column at which all preprocessors will be indented.
 
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
+pp_if_indent_code               { False, True }
+  Control whether to indent the code between #if, #else and #endif.
 
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
+pp_define_at_level              { False, True }
+  Whether to indent '#define' at the brace level (True) or from column 1 (false).
 
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
+pp_ignore_define_body           { False, True }
+  Whether to ignore the '#define' body while formatting.
 
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
+pp_indent_case                  { False, True }
+  Whether to indent case statements between #if, #else, and #endif.
+  Only applies to the indent of the preprocesser that the case statements directly inside of.
 
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
+pp_indent_func_def              { False, True }
+  Whether to indent whole function definitions between #if, #else, and #endif.
+  Only applies to the indent of the preprocesser that the function definition is directly inside of.
 
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
+pp_indent_extern                { False, True }
+  Whether to indent extern C blocks between #if, #else, and #endif.
+  Only applies to the indent of the preprocesser that the extern block is directly inside of.
 
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
+pp_indent_brace                 { False, True }
+  Whether to indent braces directly inside #if, #else, and #endif.
+  Only applies to the indent of the preprocesser that the braces are directly inside of.
 
 #
 # Sort includes options
 #
 
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
+include_category_0              String
+  The regex for include category with priority 0.
 
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
+include_category_1              String
+  The regex for include category with priority 1.
 
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
+include_category_2              String
+  The regex for include category with priority 2.
 
 #
 # Use or Do not Use options
 #
 
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
+use_indent_func_call_param      { False, True }
+  True:  indent_func_call_param will be used (default)
+  False: indent_func_call_param will NOT be used.
+
+use_indent_continue_only_once   { False, True }
+  The value of the indentation for a continuation line is calculate differently if the statement is:
+    a declaration: your case with QString fileName ...
+    an assignment: your case with pSettings = new QSettings( ...
+  At the second case the indentation value might be used twice:
+    at the assignment
+    at the function call (if present)
+  To prevent the double use of the indentation value, use this option with the value 'True'.
+  True:  indent_continue will be used only once
+  False: indent_continue will be used every time (default).
+
+indent_cpp_lambda_only_once     { False, True }
+  the value might be used twice:
+    at the assignment
+    at the opening brace
+  To prevent the double use of the indentation value, use this option with the value 'True'.
+  True:  indentation will be used only once
+  False: indentation will be used every time (default).
+
+use_options_overriding_for_qt_macros { False, True }
+  SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details.
+  Default=True.
 
 #
 # Warn levels - 1: error, 2: warning (default), 3: note
 #
 
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
+warn_level_tabs_found_in_verbatim_string_literals Unsigned Number
+  Warning is given if doing tab-to-\t replacement and we have found one in a C# verbatim string literal.
+
 
 # Meaning of the settings:
 #   Ignore - do not do any changes
@@ -2695,7 +2208,7 @@
 #       `set BOOL __AND__ __OR__`
 #
 #     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' → 'BOOL'
+#     'CT_' prefix: 'CT_BOOL' -> 'BOOL'
 #
 #
 # - Token(s) can be treated as type(s) with the 'type' option.
@@ -2719,7 +2232,7 @@
 #       `file_ext CPP .ch .cxx .cpp.in`
 #
 #     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' → 'CPP'
+#     them without the 'LANG_' prefix: 'LANG_CPP' -> 'CPP'
 #
 #
 # - Custom macro-based indentation can be set up using 'macro-open',
@@ -2732,5 +2245,3 @@
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-# option(s) with 'not default' value: 0
-#
diff -ru orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/default.cfg new/uncrustify-uncrustify-0.68.1/documentation/htdocs/default.cfg
--- orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/default.cfg	2018-11-20 18:04:30.000000000 +0100
+++ new/uncrustify-uncrustify-0.68.1/documentation/htdocs/default.cfg	2018-11-22 09:59:35.000000000 +0100
@@ -1,85 +1,65 @@
-# Uncrustify-0.68
+# Uncrustify-0.67
 
 #
 # General options
 #
 
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
+# The type of line endings. Default=Auto.
+newlines                        = auto     # auto/lf/crlf/cr
 
-# The original size of tabs in the input.
-#
-# Default: 8
+# The original size of tabs in the input. Default=8.
 input_tab_size                  = 8        # unsigned number
 
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
+# The size of tabs in the output (only used if align_with_tabs=true). Default=8.
 output_tab_size                 = 8        # unsigned number
 
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
+# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn).
 string_escape_char              = 92       # unsigned number
 
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
+# Alternate string escape char for Pawn. Only works right before the quote char.
 string_escape_char2             = 0        # unsigned number
 
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
+# Replace tab characters found in string literals with the escape sequence \t instead.
+string_replace_tab_chars        = false    # false/true
 
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
+# Allow interpreting '>=' and '>>=' as part of a template in 'void f(list<list<B>>=val);'.
+# If True, 'assert(x<0 && y>=3)' will be broken. Default=False
 # Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
+tok_split_gte                   = false    # false/true
 
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
+# Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file.
+disable_processing_cmt          = ""         # string
 
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
+# Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file.
+enable_processing_cmt           = ""         # string
 
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
+# Enable parsing of digraphs. Default=False.
+enable_digraphs                 = false    # false/true
 
-# Add or remove the UTF-8 BOM (recommend 'remove').
+# Control what to do with the UTF-8 BOM (recommend 'remove').
 utf8_bom                        = ignore   # ignore/add/remove/force
 
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
+# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8.
+utf8_byte                       = false    # false/true
 
 # Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
+utf8_force                      = false    # false/true
 
 #
 # Spacing options
 #
 
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
+# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
+# also '>>>' '<<' '>>' '%' '|'.
 sp_arith                        = ignore   # ignore/add/remove/force
 
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
+# Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith
 sp_arith_additive               = ignore   # ignore/add/remove/force
 
 # Add or remove space around assignment operator '=', '+=', etc.
 sp_assign                       = ignore   # ignore/add/remove/force
 
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
+# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign.
 sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force
 
 # Add or remove space after the capture specification in C++11 lambda.
@@ -88,14 +68,10 @@
 # Add or remove space around assignment operator '=' in a prototype.
 sp_assign_default               = ignore   # ignore/add/remove/force
 
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
+# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.
 sp_before_assign                = ignore   # ignore/add/remove/force
 
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
+# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.
 sp_after_assign                 = ignore   # ignore/add/remove/force
 
 # Add or remove space in 'NS_ENUM ('.
@@ -104,30 +80,22 @@
 # Add or remove space around assignment '=' in enum.
 sp_enum_assign                  = ignore   # ignore/add/remove/force
 
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
+# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.
 sp_enum_before_assign           = ignore   # ignore/add/remove/force
 
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
+# Add or remove space after assignment '=' in enum. Overrides sp_enum_assign.
 sp_enum_after_assign            = ignore   # ignore/add/remove/force
 
 # Add or remove space around assignment ':' in enum.
 sp_enum_colon                   = ignore   # ignore/add/remove/force
 
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
+# Add or remove space around preprocessor '##' concatenation operator. Default=Add.
 sp_pp_concat                    = add      # ignore/add/remove/force
 
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
+# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator.
 sp_pp_stringify                 = ignore   # ignore/add/remove/force
 
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
+# Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'.
 sp_before_pp_stringify          = ignore   # ignore/add/remove/force
 
 # Add or remove space around boolean operators '&&' and '||'.
@@ -139,26 +107,23 @@
 # Add or remove space inside '(' and ')'.
 sp_inside_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
+# Add or remove space between nested parens: '((' vs ') )'.
 sp_paren_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
+# Add or remove space between back-to-back parens: ')(' vs ') ('.
 sp_cparen_oparen                = ignore   # ignore/add/remove/force
 
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
+# Whether to balance spaces inside nested parens.
+sp_balance_nested_parens        = false    # false/true
 
 # Add or remove space between ')' and '{'.
 sp_paren_brace                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
-
 # Add or remove space before pointer star '*'.
 sp_before_ptr_star              = ignore   # ignore/add/remove/force
 
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to 'ignore', sp_before_ptr_star is used instead.
+# Add or remove space before pointer star '*' that isn't followed by a variable name
+# If set to 'ignore', sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
 
 # Add or remove space between pointer stars '*'.
@@ -173,118 +138,97 @@
 # Add or remove space after pointer star '*', if followed by a qualifier.
 sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force
 
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
+# Add or remove space after a pointer star '*', if followed by a func proto/def.
 sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
 
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
+# Add or remove space after a pointer star '*', if followed by an open paren (function types).
 sp_ptr_star_paren               = ignore   # ignore/add/remove/force
 
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
+# Add or remove space before a pointer star '*', if followed by a func proto/def.
 sp_before_ptr_star_func         = ignore   # ignore/add/remove/force
 
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore   # ignore/add/remove/force
 
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to 'ignore', sp_before_byref is used instead.
+# Add or remove space before a reference sign '&' that isn't followed by a variable name.
+# If set to 'ignore', sp_before_byref is used instead.
 sp_before_unnamed_byref         = ignore   # ignore/add/remove/force
 
 # Add or remove space after reference sign '&', if followed by a word.
 sp_after_byref                  = ignore   # ignore/add/remove/force
 
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
+# Add or remove space after a reference sign '&', if followed by a func proto/def.
 sp_after_byref_func             = ignore   # ignore/add/remove/force
 
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
+# Add or remove space before a reference sign '&', if followed by a func proto/def.
 sp_before_byref_func            = ignore   # ignore/add/remove/force
 
-# Add or remove space between type and word.
-#
-# Default: force
+# Add or remove space between type and word. Default=Force.
 sp_after_type                   = force    # ignore/add/remove/force
 
-# Add or remove space between 'decltype(...)' and word.
-sp_after_decltype               = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
+# Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('.
 sp_before_template_paren        = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'template' and '<'.
+# Add or remove space in 'template <' vs 'template<'.
 # If set to ignore, sp_before_angle is used.
 sp_template_angle               = ignore   # ignore/add/remove/force
 
-# Add or remove space before '<'.
+# Add or remove space before '<>'.
 sp_before_angle                 = ignore   # ignore/add/remove/force
 
 # Add or remove space inside '<' and '>'.
 sp_inside_angle                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and ':'.
+# Add or remove space between '<>' and ':'.
 sp_angle_colon                  = ignore   # ignore/add/remove/force
 
 # Add or remove space after '<>'.
 sp_after_angle                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
+# Add or remove space between '<>' and '(' as found in 'new List<byte>(foo);'.
 sp_angle_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
+# Add or remove space between '<>' and '()' as found in 'new List<byte>();'.
 sp_angle_paren_empty            = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
+# Add or remove space between '<>' and a word as in 'List<byte> m;' or 'template <typename T> static ...'.
 sp_angle_word                   = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
+# Add or remove space between '>' and '>' in '>>' (template stuff). Default=Add.
 sp_angle_shift                  = add      # ignore/add/remove/force
 
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
+# Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False.
+# sp_angle_shift cannot remove the space without this option.
+sp_permit_cpp11_shift           = false    # false/true
 
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
+# Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc.
 sp_before_sparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space inside '(' and ')' of control statements.
+# Add or remove space inside if-condition '(' and ')'.
 sp_inside_sparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
+# Add or remove space before if-condition ')'. Overrides sp_inside_sparen.
 sp_inside_sparen_close          = ignore   # ignore/add/remove/force
 
-# Add or remove space after ')' of control statements.
+# Add or remove space after if-condition '('. Overrides sp_inside_sparen.
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+
+# Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc.
 sp_after_sparen                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between ')' and '{' of of control statements.
+# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc.
 sp_sparen_brace                 = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'invariant' and '('.
+# Add or remove space between 'invariant' and '(' in the D language.
 sp_invariant_paren              = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
+# Add or remove space after the ')' in 'invariant (C) c' in the D language.
 sp_after_invariant_paren        = ignore   # ignore/add/remove/force
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
 sp_special_semi                 = ignore   # ignore/add/remove/force
 
-# Add or remove space before ';'.
-#
-# Default: remove
+# Add or remove space before ';'. Default=Remove.
 sp_before_semi                  = remove   # ignore/add/remove/force
 
 # Add or remove space before ';' in non-empty 'for' statements.
@@ -293,18 +237,13 @@
 # Add or remove space before a semicolon of an empty part of a for statement.
 sp_before_semi_for_empty        = ignore   # ignore/add/remove/force
 
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
+# Add or remove space after ';', except when followed by a comment. Default=Add.
 sp_after_semi                   = add      # ignore/add/remove/force
 
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
+# Add or remove space after ';' in non-empty 'for' statements. Default=Force.
 sp_after_semi_for               = force    # ignore/add/remove/force
 
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
+# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; <here> ).
 sp_after_semi_for_empty         = ignore   # ignore/add/remove/force
 
 # Add or remove space before '[' (except '[]').
@@ -313,52 +252,37 @@
 # Add or remove space before '[]'.
 sp_before_squares               = ignore   # ignore/add/remove/force
 
-# Add or remove space before C++17 structured bindings.
+# Add or remove space before structured bindings. Only for C++17.
 sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
 
 # Add or remove space inside a non-empty '[' and ']'.
 sp_inside_square                = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
+# Add or remove space inside a non-empty OC boxed array '@[' and ']'.
+# If set to ignore, sp_inside_square is used.
 sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
 
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
+# Add or remove space after ',', 'a,b' vs 'a, b'.
 sp_after_comma                  = ignore   # ignore/add/remove/force
 
-# Add or remove space before ','.
-#
-# Default: remove
+# Add or remove space before ','. Default=Remove.
 sp_before_comma                 = remove   # ignore/add/remove/force
 
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
+# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#.
 sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
 
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
+# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#.
 sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
 
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
+# Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#.
 sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
 
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
+# Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force.
 sp_paren_comma                  = force    # ignore/add/remove/force
 
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
+# Add or remove space before the variadic '...' when preceded by a non-punctuator.
 sp_before_ellipsis              = ignore   # ignore/add/remove/force
 
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
-
 # Add or remove space after class ':'.
 sp_after_class_colon            = ignore   # ignore/add/remove/force
 
@@ -371,46 +295,31 @@
 # Add or remove space before class constructor ':'.
 sp_before_constr_colon          = ignore   # ignore/add/remove/force
 
-# Add or remove space before case ':'.
-#
-# Default: remove
+# Add or remove space before case ':'. Default=Remove.
 sp_before_case_colon            = remove   # ignore/add/remove/force
 
 # Add or remove space between 'operator' and operator sign.
 sp_after_operator               = ignore   # ignore/add/remove/force
 
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
+# Add or remove space between the operator symbol and the open paren, as in 'operator ++('.
 sp_after_operator_sym           = ignore   # ignore/add/remove/force
 
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
+# Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'.
 sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force
 
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
+# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'.
 sp_after_cast                   = ignore   # ignore/add/remove/force
 
-# Add or remove spaces inside cast parentheses.
+# Add or remove spaces inside cast parens.
 sp_inside_paren_cast            = ignore   # ignore/add/remove/force
 
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
+# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'.
 sp_cpp_cast_paren               = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'sizeof' and '('.
 sp_sizeof_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
-
-# (Pawn) Add or remove space after the tag keyword.
+# Add or remove space after the tag keyword (Pawn).
 sp_after_tag                    = ignore   # ignore/add/remove/force
 
 # Add or remove space inside enum '{' and '}'.
@@ -419,15 +328,13 @@
 # Add or remove space inside struct/union '{' and '}'.
 sp_inside_braces_struct         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
+# Add or remove space inside OC boxed dictionary @'{' and '}'
 sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
 
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
+# Add or remove space after open brace in an unnamed temporary direct-list-initialization.
 sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force
 
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
+# Add or remove space before close brace in an unnamed temporary direct-list-initialization.
 sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
@@ -439,26 +346,23 @@
 # Add or remove space inside '{}'.
 sp_inside_braces_empty          = ignore   # ignore/add/remove/force
 
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
+# Add or remove space between return type and function name
+# A minimum of 1 is forced except for pointer return types.
 sp_type_func                    = ignore   # ignore/add/remove/force
 
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
+# Add or remove space between type and open brace of an unnamed temporary direct-list-initialization.
 sp_type_brace_init_lst          = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function declaration.
 sp_func_proto_paren             = ignore   # ignore/add/remove/force
 
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
+# Add or remove space between function name and '()' on function declaration without parameters.
 sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function definition.
 sp_func_def_paren               = ignore   # ignore/add/remove/force
 
-# Add or remove space between function name and '()' on function definition
-# without parameters.
+# Add or remove space between function name and '()' on function definition without parameters.
 sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
 
 # Add or remove space inside empty function '()'.
@@ -467,12 +371,10 @@
 # Add or remove space inside function '(' and ')'.
 sp_inside_fparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
+# Add or remove space inside the first parens in the function type: 'void (*x)(...)'.
 sp_inside_tparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
+# Add or remove between the parens in the function type: 'void (*x)(...)'.
 sp_after_tparen_close           = ignore   # ignore/add/remove/force
 
 # Add or remove space between ']' and '(' when part of a function call.
@@ -481,49 +383,39 @@
 # Add or remove space between ')' and '{' of function.
 sp_fparen_brace                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between ')' and '{' of s function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
+# Add or remove space between ')' and '{' of function call in object initialization. Overrides sp_fparen_brace.
 sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
 
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
+# Java: Add or remove space between ')' and '{{' of double brace initializer.
 sp_fparen_dbrace                = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function calls.
 sp_func_call_paren              = ignore   # ignore/add/remove/force
 
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to 'ignore' (the default), sp_func_call_paren is used.
+# Add or remove space between function name and '()' on function calls without parameters.
+# If set to 'ignore' (the default), sp_func_call_paren is used.
 sp_func_call_paren_empty        = ignore   # ignore/add/remove/force
 
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
+# Add or remove space between the user function name and '(' on function calls
+# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 sp_func_call_user_paren         = ignore   # ignore/add/remove/force
 
-# Add or remove space inside user function '(' and ')'.
+# Add or remove space inside user function '(' and ')'
+# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
 
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
+# Add or remove space between nested parens with user functions: '((' vs ') )'You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force
 
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
+# Add or remove space between a constructor/destructor and the open paren.
 sp_func_class_paren             = ignore   # ignore/add/remove/force
 
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
+# Add or remove space between a constructor without parameters or destructor and '()'.
 sp_func_class_paren_empty       = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'return' and '('.
 sp_return_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
-
 # Add or remove space between '__attribute__' and '('.
 sp_attribute_paren              = ignore   # ignore/add/remove/force
 
@@ -533,40 +425,35 @@
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
 sp_throw_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
+# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'.
 sp_after_throw                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
+# Add or remove space between 'catch' and '(' in 'catch (something) { }'
 # If set to ignore, sp_before_sparen is used.
 sp_catch_paren                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
+# Add or remove space between '@catch' and '(' in '@catch (something) { }'
+# If set to ignore, sp_catch_paren is used.
 sp_oc_catch_paren               = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
+# Add or remove space between 'version' and '(' in 'version (something) { }' (D language)
+# If set to ignore, sp_before_sparen is used.
 sp_version_paren                = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
+# Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language)
+# If set to ignore, sp_before_sparen is used.
 sp_scope_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
+# Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove.
 sp_super_paren                  = remove   # ignore/add/remove/force
 
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
+# Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove.
 sp_this_paren                   = remove   # ignore/add/remove/force
 
-# Add or remove space between a macro name and its definition.
+# Add or remove space between macro and value.
 sp_macro                        = ignore   # ignore/add/remove/force
 
-# Add or remove space between a macro function ')' and its definition.
+# Add or remove space between macro function ')' and value.
 sp_macro_func                   = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'else' and '{' if on the same line.
@@ -578,19 +465,17 @@
 # Add or remove space between '}' and the name of a typedef on the same line.
 sp_brace_typedef                = ignore   # ignore/add/remove/force
 
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
+# Add or remove space between 'catch' and '{' if on the same line.
 sp_catch_brace                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
+# Add or remove space between '@catch' and '{' if on the same line.
 # If set to ignore, sp_catch_brace is used.
 sp_oc_catch_brace               = ignore   # ignore/add/remove/force
 
 # Add or remove space between '}' and 'catch' if on the same line.
 sp_brace_catch                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
+# Add or remove space between '}' and '@catch' if on the same line.
 # If set to ignore, sp_brace_catch is used.
 sp_oc_brace_catch               = ignore   # ignore/add/remove/force
 
@@ -606,15 +491,10 @@
 # Add or remove space between get/set and '{' if on the same line.
 sp_getset_brace                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-#
-# Default: add
+# Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add.
 sp_word_brace                   = add      # ignore/add/remove/force
 
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
+# Add or remove space between a variable and '{' for a namespace. Default=Add.
 sp_word_brace_ns                = add      # ignore/add/remove/force
 
 # Add or remove space before the '::' operator.
@@ -623,714 +503,595 @@
 # Add or remove space after the '::' operator.
 sp_after_dc                     = ignore   # ignore/add/remove/force
 
-# (D) Add or remove around the D named array initializer ':' operator.
+# Add or remove around the D named array initializer ':' operator.
 sp_d_array_colon                = ignore   # ignore/add/remove/force
 
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
+# Add or remove space after the '!' (not) operator. Default=Remove.
 sp_not                          = remove   # ignore/add/remove/force
 
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
+# Add or remove space after the '~' (invert) operator. Default=Remove.
 sp_inv                          = remove   # ignore/add/remove/force
 
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
+# Add or remove space after the '&' (address-of) operator. Default=Remove
+# This does not affect the spacing after a '&' that is part of a type.
 sp_addr                         = remove   # ignore/add/remove/force
 
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
+# Add or remove space around the '.' or '->' operators. Default=Remove.
 sp_member                       = remove   # ignore/add/remove/force
 
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
+# Add or remove space after the '*' (dereference) operator. Default=Remove
+# This does not affect the spacing after a '*' that is part of a type.
 sp_deref                        = remove   # ignore/add/remove/force
 
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
+# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove.
 sp_sign                         = remove   # ignore/add/remove/force
 
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
+# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove.
 sp_incdec                       = remove   # ignore/add/remove/force
 
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
+# Add or remove space before a backslash-newline at the end of a line. Default=Add.
 sp_before_nl_cont               = add      # ignore/add/remove/force
 
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
+# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'.
 sp_after_oc_scope               = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
+# Add or remove space after the colon in message specs
+# '-(int) f:(int) x;' vs '-(int) f: (int) x;'.
 sp_after_oc_colon               = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
+# Add or remove space before the colon in message specs
+# '-(int) f: (int) x;' vs '-(int) f : (int) x;'.
 sp_before_oc_colon              = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the colon in immutable dictionary expression
+# Add or remove space after the colon in immutable dictionary expression
 # 'NSDictionary *test = @{@"foo" :@"bar"};'.
 sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the colon in immutable dictionary expression
+# Add or remove space before the colon in immutable dictionary expression
 # 'NSDictionary *test = @{@"foo" :@"bar"};'.
 sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
+# Add or remove space after the colon in message specs
+# '[object setValue:1];' vs '[object setValue: 1];'.
 sp_after_send_oc_colon          = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
+# Add or remove space before the colon in message specs
+# '[object setValue:1];' vs '[object setValue :1];'.
 sp_before_send_oc_colon         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
+# Add or remove space after the (type) in message specs
+# '-(int)f: (int) x;' vs '-(int)f: (int)x;'.
 sp_after_oc_type                = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
+# Add or remove space after the first (type) in message specs
+# '-(int) f:(int)x;' vs '-(int)f:(int)x;'.
 sp_after_oc_return_type         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
+# Add or remove space between '@selector' and '('
+# '@selector(msgName)' vs '@selector (msgName)'
+# Also applies to @protocol() constructs.
 sp_after_oc_at_sel              = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
+# Add or remove space between '@selector(x)' and the following word
+# '@selector(foo) a:' vs '@selector(foo)a:'.
 sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
+# Add or remove space inside '@selector' parens
+# '@selector(foo)' vs '@selector( foo )'
+# Also applies to @protocol() constructs.
 sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
+# Add or remove space before a block pointer caret
+# '^int (int arg){...}' vs. ' ^int (int arg){...}'.
 sp_before_oc_block_caret        = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
+# Add or remove space after a block pointer caret
+# '^int (int arg){...}' vs. '^ int (int arg){...}'.
 sp_after_oc_block_caret         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
+# Add or remove space between the receiver and selector in a message.
+# '[receiver selector ...]'.
 sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after '@property'.
+# Add or remove space after @property.
 sp_after_oc_property            = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
+# Add or remove space between '@synchronized' and the parenthesis
+# '@synchronized(foo)' vs '@synchronized (foo)'.
 sp_after_oc_synchronized        = ignore   # ignore/add/remove/force
 
 # Add or remove space around the ':' in 'b ? t : f'.
 sp_cond_colon                   = ignore   # ignore/add/remove/force
 
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
+# Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon.
 sp_cond_colon_before            = ignore   # ignore/add/remove/force
 
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
+# Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon.
 sp_cond_colon_after             = ignore   # ignore/add/remove/force
 
 # Add or remove space around the '?' in 'b ? t : f'.
 sp_cond_question                = ignore   # ignore/add/remove/force
 
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
+# Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question.
 sp_cond_question_before         = ignore   # ignore/add/remove/force
 
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
+# Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question.
 sp_cond_question_after          = ignore   # ignore/add/remove/force
 
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
+# In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options.
 sp_cond_ternary_short           = ignore   # ignore/add/remove/force
 
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
+# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
 sp_case_label                   = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space around the D '..' operator.
+# Control the space around the D '..' operator.
 sp_range                        = ignore   # ignore/add/remove/force
 
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
+# Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.
 sp_after_for_colon              = ignore   # ignore/add/remove/force
 
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
+# Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.
 sp_before_for_colon             = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
+# Control the spacing in 'extern (C)' (D).
 sp_extern_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space after the opening of a C++ comment,
-# i.e. '// A' vs. '//A'.
+# Control the space after the opening of a C++ comment '// A' vs '//A'.
 sp_cmt_cpp_start                = ignore   # ignore/add/remove/force
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space is added with sp_cmt_cpp_start will be added after Qt
-# translator or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
+# True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'.
+sp_cmt_cpp_doxygen              = false    # false/true
+
+# True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'.
+sp_cmt_cpp_qttr                 = false    # false/true
 
-# Add or remove space between #else or #endif and a trailing comment.
+# Controls the spaces between #else or #endif and a trailing comment.
 sp_endif_cmt                    = ignore   # ignore/add/remove/force
 
-# Add or remove space after 'new', 'delete' and 'delete[]'.
+# Controls the spaces after 'new', 'delete' and 'delete[]'.
 sp_after_new                    = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'new' and '(' in 'new()'.
+# Controls the spaces between new and '(' in 'new()'.
 sp_between_new_paren            = ignore   # ignore/add/remove/force
 
-# Add or remove space between ')' and type in 'new(foo) BAR'.
+# Controls the spaces between ')' and 'type' in 'new(foo) BAR'.
 sp_after_newop_paren            = ignore   # ignore/add/remove/force
 
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
+# Controls the spaces inside paren of the new operator: 'new(foo) BAR'.
 sp_inside_newop_paren           = ignore   # ignore/add/remove/force
 
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
+# Controls the space after open paren of the new operator: 'new(foo) BAR'.
 # Overrides sp_inside_newop_paren.
 sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force
 
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
+# Controls the space before close paren of the new operator: 'new(foo) BAR'.
 # Overrides sp_inside_newop_paren.
 sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force
 
-# Add or remove space before a trailing or embedded comment.
+# Controls the spaces before a trailing or embedded comment.
 sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force
 
 # Number of spaces before a trailing or embedded comment.
 sp_num_before_tr_emb_cmt        = 0        # unsigned number
 
-# (Java) Add or remove space between an annotation and the open parenthesis.
+# Control space between a Java annotation and the open paren.
 sp_annotation_paren             = ignore   # ignore/add/remove/force
 
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
+# If True, vbrace tokens are dropped to the previous token and skipped.
+sp_skip_vbrace_tokens           = false    # false/true
 
-# Add or remove space after 'noexcept'.
+# Controls the space after 'noexcept'.
 sp_after_noexcept               = ignore   # ignore/add/remove/force
 
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
+# If True, a <TAB> is inserted after #define.
+force_tab_after_define          = false    # false/true
 
 #
-# Indenting options
+# Indenting
 #
 
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
+# The number of columns to indent per level.
+# Usually 2, 3, 4, or 8. Default=8.
 indent_columns                  = 8        # unsigned number
 
-# The continuation indent. If non-zero, this overrides the indent of '(' and
-# '=' continuation indents. Negative values are OK; negative value is absolute
-# and not increased for each '(' level.
-#
-# For FreeBSD, this is set to 4.
+# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
+# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level.
 indent_continue                 = 0        # number
 
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
+# Indent empty lines - lines which contain only spaces before newline character
+indent_single_newlines          = false    # false/true
 
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
+# The continuation indent for func_*_param if they are true.
+# If non-zero, this overrides the indent.
 indent_param                    = 0        # unsigned number
 
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
+# How to use tabs when indenting code
+# 0=spaces only
+# 1=indent with tabs to brace level, align with spaces (default)
+# 2=indent and align with tabs, using spaces when not on a tabstop
 indent_with_tabs                = 1        # unsigned number
 
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
+# Comments that are not a brace level are indented with tabs on a tabstop.
+# Requires indent_with_tabs=2. If false, will use spaces.
+indent_cmt_with_tabs            = false    # false/true
 
 # Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
+indent_align_string             = false    # false/true
 
 # The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
+# Requires indent_align_string=True.
 indent_xml_string               = 0        # unsigned number
 
 # Spaces to indent '{' from level.
 indent_brace                    = 0        # unsigned number
 
 # Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
+indent_braces                   = false    # false/true
 
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
+# Disabled indenting function braces if indent_braces is True.
+indent_braces_no_func           = false    # false/true
 
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
+# Disabled indenting class braces if indent_braces is True.
+indent_braces_no_class          = false    # false/true
 
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
+# Disabled indenting struct braces if indent_braces is True.
+indent_braces_no_struct         = false    # false/true
 
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' → 3 spaces, 'for' → 4 spaces, etc.
-indent_brace_parent             = false    # true/false
+# Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
+indent_brace_parent             = false    # false/true
 
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
+# Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace.
+indent_paren_open_brace         = false    # false/true
 
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
+# indent a C# delegate by another level, default is to not indent by another level.
+indent_cs_delegate_brace        = false    # false/true
 
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
+# indent a C# delegate(To hanndle delegates with no brace) by another level. default: false
+indent_cs_delegate_body         = false    # false/true
 
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
+# Whether the 'namespace' body is indented.
+indent_namespace                = false    # false/true
 
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
+# Only indent one namespace and no sub-namespaces.
+# Requires indent_namespace=True.
+indent_namespace_single_indent  = false    # false/true
 
 # The number of spaces to indent a namespace block.
 indent_namespace_level          = 0        # unsigned number
 
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
+# If the body of the namespace is longer than this number, it won't be indented.
+# Requires indent_namespace=True. Default=0 (no limit)
 indent_namespace_limit          = 0        # unsigned number
 
 # Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
+indent_extern                   = false    # false/true
 
 # Whether the 'class' body is indented.
-indent_class                    = false    # true/false
+indent_class                    = false    # false/true
 
 # Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
+indent_class_colon              = false    # false/true
 
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
+# Indent based on a class colon instead of the stuff after the colon.
+# Requires indent_class_colon=True. Default=False.
+indent_class_on_colon           = false    # false/true
 
 # Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
+indent_constr_colon             = false    # false/true
 
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
+# Virtual indent from the ':' for member initializers. Default=2.
 indent_ctor_init_leading        = 2        # unsigned number
 
 # Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
+# Negative values decrease indent down to the first column. Default=0.
 indent_ctor_init                = 0        # number
 
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
+# False=treat 'else\nif' as 'else if' for indenting purposes
+# True=indent the 'if' one level.
+indent_else_if                  = false    # false/true
 
-# Amount to indent variable declarations after a open brace.
-#
-# <0: Relative
-# ≥0: Absolute
+# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute.
 indent_var_def_blk              = 0        # number
 
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
+# Indent continued variable declarations instead of aligning.
+indent_var_def_cont             = false    # false/true
 
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
+# Indent continued shift expressions ('<<' and '>>') instead of aligning.
+# Turn align_left_shift off when enabling this.
+indent_shift                    = false    # false/true
+
+# True:  force indentation of function definition to start in column 1
+# False: use the default behavior.
+indent_func_def_force_col1      = false    # false/true
+
+# True:  indent continued function call parameters one indent level
+# False: align parameters under the open paren.
+indent_func_call_param          = false    # false/true
 
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
+# Same as indent_func_call_param, but for function defs.
+indent_func_def_param           = false    # false/true
 
-# Same as indent_func_call_param, but for function definitions.
-indent_func_def_param           = false    # true/false
-
-# Same as indent_func_call_param, but for function prototypes.
-indent_func_proto_param         = false    # true/false
+# Same as indent_func_call_param, but for function protos.
+indent_func_proto_param         = false    # false/true
 
 # Same as indent_func_call_param, but for class declarations.
-indent_func_class_param         = false    # true/false
+indent_func_class_param         = false    # false/true
 
 # Same as indent_func_call_param, but for class variable constructors.
-indent_func_ctor_var_param      = false    # true/false
+indent_func_ctor_var_param      = false    # false/true
 
-# Same as indent_func_call_param, but for template parameter lists.
-indent_template_param           = false    # true/false
+# Same as indent_func_call_param, but for templates.
+indent_template_param           = false    # false/true
 
 # Double the indent for indent_func_xxx_param options.
 # Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
+indent_func_param_double        = false    # false/true
 
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
+# Indentation column for standalone 'const' function decl/proto qualifier.
 indent_func_const               = 0        # unsigned number
 
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
+# Indentation column for standalone 'throw' function decl/proto qualifier.
 indent_func_throw               = 0        # unsigned number
 
-# The number of spaces to indent a continued '->' or '.'.
+# The number of spaces to indent a continued '->' or '.'
 # Usually set to 0, 1, or indent_columns.
 indent_member                   = 0        # unsigned number
 
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
+# setting to true will indent lines broken at '.' or '->' by a single indent
+# UO_indent_member option will not be effective if this is set to true.
+indent_member_single            = false    # false/true
 
 # Spaces to indent single line ('//') comments on lines before code.
 indent_sing_line_comments       = 0        # unsigned number
 
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
+# If set, will indent trailing single line ('//') comments relative
+# to the code instead of trying to keep the same absolute column.
+indent_relative_single_line_comments = false    # false/true
 
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# Spaces to indent 'case' from 'switch'
+# Usually 0 or indent_columns.
 indent_switch_case              = 0        # unsigned number
 
 # Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
+indent_switch_pp                = true     # false/true
 
-# Spaces to shift the 'case' line, without affecting any other lines.
+# Spaces to shift the 'case' line, without affecting any other lines
 # Usually 0.
 indent_case_shift               = 0        # unsigned number
 
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
+# Spaces to indent '{' from 'case'.
+# By default, the brace will appear under the 'c' in case.
+# Usually set to 0 or indent_columns.
+# negative value are OK.
 indent_case_brace               = 0        # number
 
 # Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
+indent_col1_comment             = false    # false/true
 
-# How to indent goto labels.
-#
-# >0: Absolute column where 1 is the leftmost column
-# ≤0: Subtract from brace indent
-#
-# Default: 1
+# How to indent goto labels
+#   >0: absolute column where 1 is the leftmost column
+#  <=0: subtract from brace indent
+# Default=1
 indent_label                    = 1        # number
 
-# Same as indent_label, but for access specifiers that are followed by a
-# colon.
-#
-# Default: 1
+# Same as indent_label, but for access specifiers that are followed by a colon. Default=1
 indent_access_spec              = 1        # number
 
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
+# Indent the code after an access specifier by one level.
+# If set, this option forces 'indent_access_spec=0'.
+indent_access_spec_body         = false    # false/true
+
+# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended).
+indent_paren_nl                 = false    # false/true
+
+# Controls the indent of a close paren after a newline.
+# 0: Indent to body level
+# 1: Align under the open paren
 # 2: Indent to the brace level
 indent_paren_close              = 0        # unsigned number
 
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
+# Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren
+indent_paren_after_func_def     = false    # false/true
 
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
+# Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren
+indent_paren_after_func_decl    = false    # false/true
 
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
+# Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren
+indent_paren_after_func_call    = false    # false/true
 
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
+# Controls the indent of a comma when inside a paren.If True, aligns under the open paren.
+indent_comma_paren              = false    # false/true
 
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
+# Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren.
+indent_bool_paren               = false    # false/true
 
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
+# Controls the indent of a semicolon when inside a for paren.If True, aligns under the open for paren.
+indent_semicolon_for_paren      = false    # false/true
 
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
+# If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.
+indent_first_bool_expr          = false    # false/true
 
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
+# If 'indent_semicolon_for_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.
+indent_first_for_expr           = false    # false/true
 
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
+# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended).
+indent_square_nl                = false    # false/true
 
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
+# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies.
+indent_preserve_sql             = false    # false/true
 
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
+# Align continued statements at the '='. Default=True
+# If False or the '=' is followed by a newline, the next line is indent one tab.
+indent_align_assign             = true     # false/true
 
-# Whether to align continued statements at the '('. If false or the '(' is not
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
+# Align continued statements at the '('. Default=True
+# If FALSE or the '(' is not followed by a newline, the next line indent is one tab.
+indent_align_paren              = true     # false/true
 
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
+# Indent OC blocks at brace level instead of usual rules.
+indent_oc_block                 = false    # false/true
 
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
+# Indent OC blocks in a message relative to the parameter name.
+# 0=use indent_oc_block rules, 1+=spaces to indent
 indent_oc_block_msg             = 0        # unsigned number
 
-# (OC) Minimum indent for subsequent parameters
+# Minimum indent for subsequent parameters
 indent_oc_msg_colon             = 0        # unsigned number
 
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
+# If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).
+# Default=True.
+indent_oc_msg_prioritize_first_colon = true     # false/true
+
+# If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level).
+indent_oc_block_msg_xcode_style = false    # false/true
 
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword.
+indent_oc_block_msg_from_keyword = false    # false/true
 
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon.
+indent_oc_block_msg_from_colon  = false    # false/true
+
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is.
+indent_oc_block_msg_from_caret  = false    # false/true
+
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is.
+indent_oc_block_msg_from_brace  = false    # false/true
+
+# When indenting after virtual brace open and newline add further spaces to reach this min. indent.
 indent_min_vbrace_open          = 0        # unsigned number
 
-# Whether to add further spaces after regular indent to reach next tabstop
-# when identing after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
+# True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop.
+indent_vbrace_open_on_tabstop   = false    # false/true
 
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
+# If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True.
+indent_token_after_brace        = true     # false/true
 
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
+# If True, cpp lambda body will be indentedDefault=False.
+indent_cpp_lambda_body          = false    # false/true
 
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
+# indent (or not) an using block if no braces are used. Only for C#.Default=True.
+indent_using_block              = true     # false/true
 
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
+# indent the continuation of ternary operator.
+# 0: (Default) off
 # 1: When the `if_false` is a continuation, indent it under `if_false`
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
 # If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
+indent_off_after_return_new     = false    # false/true
 
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
+# If true, the tokens after return are indented with regular single indentation.By default (false) the indentation is after the return token.
+indent_single_after_return      = false    # false/true
 
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
+# If true, ignore indent and align for asm blocks as they have their own indentation.
+indent_ignore_asm_block         = false    # false/true
 
 #
 # Newline adding and removing options
 #
 
 # Whether to collapse empty blocks between '{' and '}'.
-nl_collapse_empty_body          = false    # true/false
+nl_collapse_empty_body          = false    # false/true
 
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
+# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'.
+nl_assign_leave_one_liners      = false    # false/true
 
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
+# Don't split one-line braced statements inside a class xx { } body.
+nl_class_leave_one_liners       = false    # false/true
 
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
+# Don't split one-line enums: 'enum foo { BAR = 15 };'
+nl_enum_leave_one_liners        = false    # false/true
 
 # Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
+nl_getset_leave_one_liners      = false    # false/true
 
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-nl_func_leave_one_liners        = false    # true/false
+# Don't split one-line get or set functions.
+nl_cs_property_leave_one_liners = false    # false/true
 
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
+# Don't split one-line function definitions - 'int foo() { return 0; }'.
+nl_func_leave_one_liners        = false    # false/true
 
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
+# Don't split one-line C++11 lambdas - '[]() { return 0; }'.
+nl_cpp_lambda_leave_one_liners  = false    # false/true
 
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
+# Don't split one-line if/else statements - 'if(a) b++;'.
+nl_if_leave_one_liners          = false    # false/true
 
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
+# Don't split one-line while statements - 'while(a) b++;'.
+nl_while_leave_one_liners       = false    # false/true
 
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
+# Don't split one-line for statements - 'for(...) b++;'.
+nl_for_leave_one_liners         = false    # false/true
 
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+# Don't split one-line OC messages.
+nl_oc_msg_leave_one_liner       = false    # false/true
 
-# (OC) Add or remove newline between Objective-C block signature and '{'.
+# Add or remove newline between Objective-C block signature and '{'.
 nl_oc_block_brace               = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline between '@interface' and '{'.
+# Add or remove newline between @interface and '{'.
 nl_oc_interface_brace           = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline between '@implementation' and '{'.
+# Add or remove newline between @implementation and '{'.
 nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
 
 # Add or remove newlines at the start of the file.
 nl_start_of_file                = ignore   # ignore/add/remove/force
 
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
+# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'.
 nl_start_of_file_min            = 0        # unsigned number
 
 # Add or remove newline at the end of the file.
 nl_end_of_file                  = ignore   # ignore/add/remove/force
 
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
+# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force').
 nl_end_of_file_min              = 0        # unsigned number
 
 # Add or remove newline between '=' and '{'.
 nl_assign_brace                 = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between '=' and '['.
+# Add or remove newline between '=' and '[' (D only).
 nl_assign_square                = ignore   # ignore/add/remove/force
 
 # Add or remove newline between '[]' and '{'.
 nl_tsquare_brace                = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
+# Add or remove newline after '= [' (D only). Will also affect the newline before the ']'.
 nl_after_square_assign          = ignore   # ignore/add/remove/force
 
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
+# The number of blank lines after a block of variable definitions at the top of a function body
 # 0 = No change (default).
 nl_func_var_def_blk             = 0        # unsigned number
 
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0 = No change (default).
+# The number of newlines before a block of typedefs
+# 0 = No change (default)
+# is overridden by the option 'nl_after_access_spec'.
 nl_typedef_blk_start            = 0        # unsigned number
 
-# The number of newlines after a block of typedefs.
-#
+# The number of newlines after a block of typedefs
 # 0 = No change (default).
 nl_typedef_blk_end              = 0        # unsigned number
 
-# The maximum number of consecutive newlines within a block of typedefs.
-#
+# The maximum consecutive newlines within a block of typedefs
 # 0 = No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0 = No change (default).
+# The number of newlines before a block of variable definitions not at the top of a function body
+# 0 = No change (default)
+# is overridden by the option 'nl_after_access_spec'.
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
+# The number of newlines after a block of variable definitions not at the top of a function body
 # 0 = No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
 
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
+# The maximum consecutive newlines within a block of variable definitions
 # 0 = No change (default).
 nl_var_def_blk_in               = 0        # unsigned number
 
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
+# Add or remove newline between a function call's ')' and '{', as in:
+# list_for_each(item, &list) { }.
 nl_fcall_brace                  = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'enum' and '{'.
@@ -1345,7 +1106,7 @@
 # Add or remove newline between 'enum class' type and ':'.
 nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'enum class identifier :' and type.
+# Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'.
 nl_enum_colon_type              = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'struct and '{'.
@@ -1360,8 +1121,8 @@
 # Add or remove newline between '}' and 'else'.
 nl_brace_else                   = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
+# Add or remove newline between 'else if' and '{'
+# If set to ignore, nl_if_brace is used instead.
 nl_elseif_brace                 = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'else' and '{'.
@@ -1388,19 +1149,18 @@
 # Add or remove newline between 'for' and '{'.
 nl_for_brace                    = ignore   # ignore/add/remove/force
 
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
+# Add or remove newline between 'catch' and '{'.
 nl_catch_brace                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
+# Add or remove newline between '@catch' and '{'.
+# If set to ignore, nl_catch_brace is used.
 nl_oc_catch_brace               = ignore   # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'catch'.
 nl_brace_catch                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
+# Add or remove newline between '}' and 'catch'.
+# If set to ignore, nl_brace_catch is used.
 nl_oc_brace_catch               = ignore   # ignore/add/remove/force
 
 # Add or remove newline between '}' and ']'.
@@ -1412,20 +1172,20 @@
 # Add or remove newline between 'while' and '{'.
 nl_while_brace                  = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between 'scope (x)' and '{'.
+# Add or remove newline between 'scope (x)' and '{' (D).
 nl_scope_brace                  = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between 'unittest' and '{'.
+# Add or remove newline between 'unittest' and '{' (D).
 nl_unittest_brace               = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between 'version (x)' and '{'.
+# Add or remove newline between 'version (x)' and '{' (D).
 nl_version_brace                = ignore   # ignore/add/remove/force
 
-# (C#) Add or remove newline between 'using' and '{'.
+# Add or remove newline between 'using' and '{'.
 nl_using_brace                  = ignore   # ignore/add/remove/force
 
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
+# Add or remove newline between two open or close braces.
+# Due to general newline/brace handling, REMOVE may not work.
 nl_brace_brace                  = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'do' and '{'.
@@ -1440,32 +1200,26 @@
 # Add or remove newline between 'synchronized' and '{'.
 nl_synchronized_brace           = ignore   # ignore/add/remove/force
 
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
+# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.
+# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace.
+nl_multi_line_cond              = false    # false/true
 
 # Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
+nl_multi_line_define            = false    # false/true
 
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force
+# Whether to put a newline before 'case' statement, not after the first 'case'.
+nl_before_case                  = false    # false/true
 
 # Add or remove newline between ')' and 'throw'.
 nl_before_throw                 = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'namespace' and '{'.
+# Whether to put a newline after 'case' statement.
+nl_after_case                   = false    # false/true
+
+# Add or remove a newline between a case ':' and '{'. Overrides nl_after_case.
+nl_case_colon_brace             = ignore   # ignore/add/remove/force
+
+# Newline between namespace and {.
 nl_namespace_brace              = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'template<>' and whatever follows.
@@ -1474,56 +1228,48 @@
 # Add or remove newline between 'class' and '{'.
 nl_class_brace                  = ignore   # ignore/add/remove/force
 
-# Add or remove newline before or after (depending on pos_class_comma) each
-# ',' in the base class list.
+# Add or remove newline before/after each ',' in the base class list,
+#   (tied to pos_class_comma).
 nl_class_init_args              = ignore   # ignore/add/remove/force
 
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
+# Add or remove newline after each ',' in the constructor member initialization.
+# Related to nl_constr_colon, pos_constr_colon and pos_constr_comma.
 nl_constr_init_args             = ignore   # ignore/add/remove/force
 
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
+# Add or remove newline before first element, after comma, and after last element in enum.
 nl_enum_own_lines               = ignore   # ignore/add/remove/force
 
-# Add or remove newline between return type and function name in a function
-# definition.
+# Add or remove newline between return type and function name in a function definition.
 nl_func_type_name               = ignore   # ignore/add/remove/force
 
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
+# Add or remove newline between return type and function name inside a class {}
+# Uses nl_func_type_name or nl_func_proto_type_name if set to ignore.
 nl_func_type_name_class         = ignore   # ignore/add/remove/force
 
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
+# Add or remove newline between class specification and '::' in 'void A::f() { }'
+# Only appears in separate member implementation (does not appear with in-line implmementation).
 nl_func_class_scope             = ignore   # ignore/add/remove/force
 
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
+# Add or remove newline between function scope and name
+# Controls the newline after '::' in 'void A::f() { }'.
 nl_func_scope_name              = ignore   # ignore/add/remove/force
 
 # Add or remove newline between return type and function name in a prototype.
 nl_func_proto_type_name         = ignore   # ignore/add/remove/force
 
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
+# Add or remove newline between a function name and the opening '(' in the declaration.
 nl_func_paren                   = ignore   # ignore/add/remove/force
 
 # Overrides nl_func_paren for functions with no parameters.
 nl_func_paren_empty             = ignore   # ignore/add/remove/force
 
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
+# Add or remove newline between a function name and the opening '(' in the definition.
 nl_func_def_paren               = ignore   # ignore/add/remove/force
 
 # Overrides nl_func_def_paren for functions with no parameters.
 nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
 
-# Add or remove newline between a function name and the opening '(' in the
-# call.
+# Add or remove newline between a function name and the opening '(' in the call
 nl_func_call_paren              = ignore   # ignore/add/remove/force
 
 # Overrides nl_func_call_paren for functions with no parameters.
@@ -1541,13 +1287,11 @@
 # Overrides nl_func_def_start when there is only one parameter.
 nl_func_def_start_single        = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
+# Whether to add newline after '(' in a function declaration if '(' and ')' are in different lines.
+nl_func_decl_start_multi_line   = false    # false/true
+
+# Whether to add newline after '(' in a function definition if '(' and ')' are in different lines.
+nl_func_def_start_multi_line    = false    # false/true
 
 # Add or remove newline after each ',' in a function declaration.
 nl_func_decl_args               = ignore   # ignore/add/remove/force
@@ -1555,13 +1299,11 @@
 # Add or remove newline after each ',' in a function definition.
 nl_func_def_args                = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
+# Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines.
+nl_func_decl_args_multi_line    = false    # false/true
+
+# Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines.
+nl_func_def_args_multi_line     = false    # false/true
 
 # Add or remove newline before the ')' in a function declaration.
 nl_func_decl_end                = ignore   # ignore/add/remove/force
@@ -1575,13 +1317,11 @@
 # Overrides nl_func_def_end when there is only one parameter.
 nl_func_def_end_single          = ignore   # ignore/add/remove/force
 
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
+# Whether to add newline before ')' in a function declaration if '(' and ')' are in different lines.
+nl_func_decl_end_multi_line     = false    # false/true
+
+# Whether to add newline before ')' in a function definition if '(' and ')' are in different lines.
+nl_func_def_end_multi_line      = false    # false/true
 
 # Add or remove newline between '()' in a function declaration.
 nl_func_decl_empty              = ignore   # ignore/add/remove/force
@@ -1592,21 +1332,18 @@
 # Add or remove newline between '()' in a function call.
 nl_func_call_empty              = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
+# Whether to add newline after '(' in a function call if '(' and ')' are in different lines.
+nl_func_call_start_multi_line   = false    # false/true
+
+# Whether to add newline after each ',' in a function call if '(' and ')' are in different lines.
+nl_func_call_args_multi_line    = false    # false/true
 
-# (OC) Whether to put each Objective-C message parameter on a separate line.
+# Whether to add newline before ')' in a function call if '(' and ')' are in different lines.
+nl_func_call_end_multi_line     = false    # false/true
+
+# Whether to put each OC message parameter on a separate line
 # See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
+nl_oc_msg_args                  = false    # false/true
 
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = ignore   # ignore/add/remove/force
@@ -1614,77 +1351,70 @@
 # Add or remove newline between C++11 lambda signature and '{'.
 nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'return' and the return expression.
+# Add or remove a newline between the return keyword and return expression.
 nl_return_expr                  = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
+# Whether to put a newline after semicolons, except in 'for' statements.
+nl_after_semicolon              = false    # false/true
 
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
+# Java: Control the newline between the ')' and '{{' of the double brace initializer.
 nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
+# Whether to put a newline after the type in an unnamed temporary direct-list-initialization.
 nl_type_brace_init_lst          = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
+# Whether to put a newline after open brace in an unnamed temporary direct-list-initialization.
 nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force
 
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
+# Whether to put a newline before close brace in an unnamed temporary direct-list-initialization.
 nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
+# Whether to put a newline after brace open.
+# This also adds a newline before the matching brace close.
+nl_after_brace_open             = false    # false/true
+
+# If nl_after_brace_open and nl_after_brace_open_cmt are True, a newline is
+# placed between the open brace and a trailing single-line comment.
+nl_after_brace_open_cmt         = false    # false/true
 
-# Whether to add a newline after a virtual brace open with a non-empty body.
+# Whether to put a newline after a virtual brace open with a non-empty body.
 # These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
+nl_after_vbrace_open            = false    # false/true
 
-# Whether to add a newline after a virtual brace open with an empty body.
+# Whether to put a newline after a virtual brace open with an empty body.
 # These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
+nl_after_vbrace_open_empty      = false    # false/true
+
+# Whether to put a newline after a brace close.
+# Does not apply if followed by a necessary ';'.
+nl_after_brace_close            = false    # false/true
+
+# Whether to put a newline after a virtual brace close.
+# Would add a newline before return in: 'if (foo) a++; return;'.
+nl_after_vbrace_close           = false    # false/true
 
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
+# Control the newline between the close brace and 'b' in: 'struct { int a; } b;'
+# Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close.
 nl_brace_struct_var             = ignore   # ignore/add/remove/force
 
 # Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
+nl_define_macro                 = false    # false/true
 
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
+# Whether to alter newlines between consecutive paren closes, 
+# The number of closing paren in a line will depend on respective open paren lines
+nl_squeeze_paren_close          = false    # false/true
+
+# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs.
+nl_squeeze_ifdef                = false    # false/true
 
 # Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
+nl_squeeze_ifdef_top_level      = false    # false/true
 
 # Add or remove blank line before 'if'.
 nl_before_if                    = ignore   # ignore/add/remove/force
 
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
+# Add or remove blank line after 'if' statement.
+# Add/Force work only if the next token is not a closing brace.
 nl_after_if                     = ignore   # ignore/add/remove/force
 
 # Add or remove blank line before 'for'.
@@ -1717,111 +1447,92 @@
 # Add or remove blank line after 'do/while' statement.
 nl_after_do                     = ignore   # ignore/add/remove/force
 
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
+# Whether to double-space commented-entries in struct/union/enum.
+nl_ds_struct_enum_cmt           = false    # false/true
+
+# force nl before } of a struct/union/enum
+# (lower priority than 'eat_blanks_before_close_brace').
+nl_ds_struct_enum_close_brace   = false    # false/true
 
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
+# Add or remove blank line before 'func_class_def'.
+nl_before_func_class_def        = 0        # unsigned number
 
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
+# Add or remove blank line before 'func_class_proto'.
+nl_before_func_class_proto      = 0        # unsigned number
+
+# Add or remove a newline before/after a class colon,
+#   (tied to pos_class_colon).
 nl_class_colon                  = ignore   # ignore/add/remove/force
 
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
+# Add or remove a newline around a class constructor colon.
+# Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma.
 nl_constr_colon                 = ignore   # ignore/add/remove/force
 
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' → 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' → 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' → 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
+# If true turns two liner namespace to one liner,else will make then four liners
+nl_namespace_two_to_one_liner   = false    # false/true
+
+# Change simple unbraced if statements into a one-liner
+# 'if(b)\n i++;' => 'if(b) i++;'.
+nl_create_if_one_liner          = false    # false/true
+
+# Change simple unbraced for statements into a one-liner
+# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'.
+nl_create_for_one_liner         = false    # false/true
+
+# Change simple unbraced while statements into a one-liner
+# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'.
+nl_create_while_one_liner       = false    # false/true
+
+# Change simple 4,3,2 liner function def statements into a one-liner
+nl_create_func_def_one_liner    = false    # false/true
+
+#  Change a one-liner if statement into simple unbraced if
+# 'if(b) i++;' => 'if(b)\n i++;'.
+nl_split_if_one_liner           = false    # false/true
+
+# Change a one-liner for statement into simple unbraced for
+# 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'.
+nl_split_for_one_liner          = false    # false/true
+
+# Change a one-liner while statement into simple unbraced while
+# 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'.
+nl_split_while_one_liner        = false    # false/true
 
 #
 # Blank line options
 #
 
-# The maximum number of consecutive newlines (3 = 2 blank lines).
+# The maximum consecutive newlines (3 = 2 blank lines).
 nl_max                          = 0        # unsigned number
 
-# The maximum number of consecutive newlines in a function.
+# The maximum consecutive newlines in function.
 nl_max_blank_in_func            = 0        # unsigned number
 
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition.
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
+# The number of newlines after a function prototype, if followed by another function prototype.
 nl_after_func_proto             = 0        # unsigned number
 
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
+# The number of newlines after a function prototype, if not followed by another function prototype.
 nl_after_func_proto_group       = 0        # unsigned number
 
-# The number of newlines after a class constructor/destructor prototype.
+# The number of newlines after a function class prototype, if followed by another function class prototype.
 nl_after_func_class_proto       = 0        # unsigned number
 
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
+# The number of newlines after a function class prototype, if not followed by another function class prototype.
 nl_after_func_class_proto_group = 0        # unsigned number
 
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
+# The number of newlines before a multi-line function def body.
+nl_before_func_body_def         = 0        # unsigned number
+
+# The number of newlines before a multi-line function prototype body.
+nl_before_func_body_proto       = 0        # unsigned number
 
 # The number of newlines after '}' of a multi-line function body.
 nl_after_func_body              = 0        # unsigned number
 
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
+# The number of newlines after '}' of a multi-line function body in a class declaration.
 nl_after_func_body_class        = 0        # unsigned number
 
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
+# The number of newlines after '}' of a single line function body.
 nl_after_func_body_one_liner    = 0        # unsigned number
 
 # The minimum number of newlines before a multi-line comment.
@@ -1837,10 +1548,10 @@
 nl_before_cpp_comment           = 0        # unsigned number
 
 # Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
+nl_after_multiline_comment      = false    # false/true
 
 # Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
+nl_after_label_colon            = false    # false/true
 
 # The number of newlines after '}' or ';' of a struct/enum/union definition.
 nl_after_struct                 = 0        # unsigned number
@@ -1851,83 +1562,58 @@
 # The number of newlines after '}' or ';' of a class definition.
 nl_after_class                  = 0        # unsigned number
 
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0 = No change (default).
+# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
+# Will not change the newline count if after a brace open.
+# 0 = No change.
 nl_before_access_spec           = 0        # unsigned number
 
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0 = No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
+# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.
+# 0 = No change.
+# Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'.
 nl_after_access_spec            = 0        # unsigned number
 
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0 = No change (default).
+# The number of newlines between a function def and the function comment.
+# 0 = No change.
 nl_comment_func_def             = 0        # unsigned number
 
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0 = No change (default).
+# The number of newlines after a try-catch-finally block that isn't followed by a brace close.
+# 0 = No change.
 nl_after_try_catch_finally      = 0        # unsigned number
 
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0 = No change (default).
+# The number of newlines before and after a property, indexer or event decl.
+# 0 = No change.
 nl_around_cs_property           = 0        # unsigned number
 
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0 = No change (default).
+# The number of newlines between the get/set/add/remove handlers in C#.
+# 0 = No change.
 nl_between_get_set              = 0        # unsigned number
 
-# (C#) Add or remove newline between property and the '{'.
+# Add or remove newline between C# property and the '{'.
 nl_property_brace               = ignore   # ignore/add/remove/force
 
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0 = Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
 # Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
+eat_blanks_after_open_brace     = false    # false/true
 
 # Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
+eat_blanks_before_close_brace   = false    # false/true
 
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
+# How aggressively to remove extra newlines not in preproc.
+# 0: No change
 # 1: Remove most newlines not handled by other config
 # 2: Remove all newlines and reformat completely by config
 nl_remove_extra_newlines        = 0        # unsigned number
 
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
+# Whether to put a blank line before 'return' statements, unless after an open brace.
+nl_before_return                = false    # false/true
+
+# Whether to put a blank line after 'return' statements, unless followed by a close brace.
+nl_after_return                 = false    # false/true
 
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
+# Whether to put a newline after a Java annotation statement.
+# Only affects annotations that are after a newline.
 nl_after_annotation             = ignore   # ignore/add/remove/force
 
-# (Java) Add or remove newline between two annotations.
+# Controls the newline between two annotations.
 nl_between_annotation           = ignore   # ignore/add/remove/force
 
 #
@@ -1935,486 +1621,382 @@
 #
 
 # The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_arith                       = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of assignment in wrapped expressions.
+# Do not affect '=' followed by '{'.
+pos_assign                      = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of boolean operators in wrapped expressions.
+pos_bool                        = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_compare                     = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of conditional (b ? t : f) operators in wrapped expressions.
+pos_conditional                 = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_comma                       = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_enum_comma                  = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of the comma in the base class list if there are more than one line,
+#   (tied to nl_class_init_args).
+pos_class_comma                 = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in the constructor initialization list.
 # Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_comma                = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of trailing/leading class colon, between class and base class list
+#   (tied to nl_class_colon).
+pos_class_colon                 = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of colons between constructor and member initialization.
+# The position of colons between constructor and member initialization,
+# (tied to nl_constr_colon).
 # Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_colon                = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 #
-# Line splitting options
+# Line Splitting options
 #
 
-# Try to limit code width to N columns.
+# Try to limit code width to N number of columns
 code_width                      = 0        # unsigned number
 
 # Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
+ls_for_split_full               = false    # false/true
 
-# Whether to fully split long function prototypes/calls at commas.
-ls_func_split_full              = false    # true/false
+# Whether to fully split long function protos/calls at commas.
+ls_func_split_full              = false    # false/true
 
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-ls_code_width                   = false    # true/false
+# Whether to split lines as close to code_width as possible and ignore some groupings.
+ls_code_width                   = false    # false/true
 
 #
-# Code alignment options (not left column spaces/tabs)
+# Code alignment (not left column spaces/tabs)
 #
 
 # Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
+align_keep_tabs                 = false    # false/true
 
 # Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
+align_with_tabs                 = false    # false/true
 
 # Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
+align_on_tabstop                = false    # false/true
 
 # Whether to right-align numbers.
-align_number_right              = false    # true/false
+align_number_right              = false    # false/true
 
 # Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
+align_keep_extra_space          = false    # false/true
 
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
+# Align variable definitions in prototypes and functions.
+align_func_params               = false    # false/true
 
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0 = Don't align (default).
+# The span for aligning parameter definitions in function on parameter name (0=don't align).
 align_func_params_span          = 0        # unsigned number
 
-# The threshold for aligning function parameter definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning function parameter definitions (0=no limit).
 align_func_params_thresh        = 0        # unsigned number
 
 # The gap for aligning function parameter definitions.
 align_func_params_gap           = 0        # unsigned number
 
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
+# Align parameters in single-line functions that have the same name.
+# The function names must already be aligned with each other.
+align_same_func_call_params     = false    # false/true
 
-# The span for aligning function-call parameters for single line functions.
-#
-# 0 = Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
+# The span for aligning parameters in single line functions with the same name (0=don't align).
+align_same_func_call_params_span = 0       # unsigned number
 
-# The threshold for aligning function-call parameters for single line
-# functions.
-#
-# 0 = No limit (default).
-align_same_func_call_params_thresh = 0        # unsigned number
+# The thresh for aligning function call parameters (0=no limit).
+align_same_func_call_params_thresh = 0     # unsigned number
 
-# The span for aligning variable definitions.
-#
-# 0 = Don't align (default).
+# The span for aligning variable definitions (0=don't align)
 align_var_def_span              = 0        # unsigned number
 
-# How to align the '*' in variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
+# How to align the star in variable definitions.
+#  0=Part of the type     'void *   foo;'
+#  1=Part of the variable 'void     *foo;'
+#  2=Dangling             'void    *foo;'
 align_var_def_star_style        = 0        # unsigned number
 
 # How to align the '&' in variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
+#  0=Part of the type
+#  1=Part of the variable
+#  2=Dangling
 align_var_def_amp_style         = 0        # unsigned number
 
-# The threshold for aligning variable definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning variable definitions (0=no limit)
 align_var_def_thresh            = 0        # unsigned number
 
 # The gap for aligning variable definitions.
 align_var_def_gap               = 0        # unsigned number
 
 # Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
+align_var_def_colon             = false    # false/true
 
-# The gap for aligning the colon in struct bit fields.
+# align variable defs gap for bit colons.
 align_var_def_colon_gap         = 0        # unsigned number
 
 # Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
+align_var_def_attribute         = false    # false/true
 
 # Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
+align_var_def_inline            = false    # false/true
 
-# The span for aligning on '=' in assignments.
-#
-# 0 = Don't align (default).
+# The span for aligning on '=' in assignments (0=don't align)
 align_assign_span               = 0        # unsigned number
 
-# The threshold for aligning on '=' in assignments.
-#
-# 0 = No limit (default).
+# The threshold for aligning on '=' in assignments (0=no limit)
 align_assign_thresh             = 0        # unsigned number
 
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0 = Don't align (default).
+# The span for aligning on '=' in enums (0=don't align)
 align_enum_equ_span             = 0        # unsigned number
 
-# The threshold for aligning on '=' in enums.
-#
-# 0 = no limit (default).
+# The threshold for aligning on '=' in enums (0=no limit)
 align_enum_equ_thresh           = 0        # unsigned number
 
-# The span for aligning class member definitions.
-#
-# 0 = Don't align (default).
+# The span for aligning class (0=don't align)
 align_var_class_span            = 0        # unsigned number
 
-# The threshold for aligning class member definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning class member definitions (0=no limit).
 align_var_class_thresh          = 0        # unsigned number
 
 # The gap for aligning class member definitions.
 align_var_class_gap             = 0        # unsigned number
 
-# The span for aligning struct/union member definitions.
-#
-# 0 = Don't align (default).
+# The span for aligning struct/union (0=don't align)
 align_var_struct_span           = 0        # unsigned number
 
-# The threshold for aligning struct/union member definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning struct/union member definitions (0=no limit)
 align_var_struct_thresh         = 0        # unsigned number
 
 # The gap for aligning struct/union member definitions.
 align_var_struct_gap            = 0        # unsigned number
 
-# The span for aligning struct initializer values.
-#
-# 0 = Don't align (default).
+# The span for aligning struct initializer values (0=don't align)
 align_struct_init_span          = 0        # unsigned number
 
 # The minimum space between the type and the synonym of a typedef.
 align_typedef_gap               = 0        # unsigned number
 
-# The span for aligning single-line typedefs.
-#
-# 0 = Don't align (default).
+# The span for aligning single-line typedefs (0=don't align).
 align_typedef_span              = 0        # unsigned number
 
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
+# How to align typedef'd functions with other typedefs
+# 0: Don't mix them at all
+# 1: align the open paren with the types
+# 2: align the function type name with the other type names
 align_typedef_func              = 0        # unsigned number
 
-# How to align the '*' in typedefs.
-#
-# 0: Align on typedef type, ignore '*' (default)
-# 1: The '*' is part of type name: 'typedef int  *pint;'
-# 2: The '*' is part of the type, but dangling: 'typedef int *pint;'
+# Controls the positioning of the '*' in typedefs. Just try it.
+# 0: Align on typedef type, ignore '*'
+# 1: The '*' is part of type name: typedef int  *pint;
+# 2: The '*' is part of the type, but dangling: typedef int *pint;
 align_typedef_star_style        = 0        # unsigned number
 
-# How to align the '&' in typedefs.
-#
-# 0: Align on typedef type, ignore '&' (default)
-# 1: The '&' is part of type name: 'typedef int  &pint;'
-# 2: The '&' is part of the type, but dangling: 'typedef int &pint;'
+# Controls the positioning of the '&' in typedefs. Just try it.
+# 0: Align on typedef type, ignore '&'
+# 1: The '&' is part of type name: typedef int  &pint;
+# 2: The '&' is part of the type, but dangling: typedef int &pint;
 align_typedef_amp_style         = 0        # unsigned number
 
-# The span for aligning comments that end lines.
-#
-# 0 = Don't align (default).
+# The span for aligning comments that end lines (0=don't align)
 align_right_cmt_span            = 0        # unsigned number
 
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
+# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment.
+align_right_cmt_mix             = false    # false/true
+
+# If a trailing comment is more than this number of columns away from the text it follows,
+# it will qualify for being aligned. This has to be > 0 to do anything.
 align_right_cmt_gap             = 0        # unsigned number
 
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0 = Ignore (default).
+# Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore)
 align_right_cmt_at_col          = 0        # unsigned number
 
-# The span for aligning function prototypes.
-#
-# 0 = Don't align (default).
+# The span for aligning function prototypes (0=don't align).
 align_func_proto_span           = 0        # unsigned number
 
 # Minimum gap between the return type and the function name.
 align_func_proto_gap            = 0        # unsigned number
 
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
+# Align function protos on the 'operator' keyword instead of what follows.
+align_on_operator               = false    # false/true
+
+# Whether to mix aligning prototype and variable declarations.
+# If True, align_var_def_XXX options are used instead of align_func_proto_XXX options.
+align_mix_var_proto             = false    # false/true
+
+# Align single-line functions with function prototypes, uses align_func_proto_span.
+align_single_line_func          = false    # false/true
+
+# Aligning the open brace of single-line functions.
+# Requires align_single_line_func=True, uses align_func_proto_span.
+align_single_line_brace         = false    # false/true
 
 # Gap for align_single_line_brace.
 align_single_line_brace_gap     = 0        # unsigned number
 
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0 = Don't align (default).
+# The span for aligning ObjC msg spec (0=don't align)
 align_oc_msg_spec_span          = 0        # unsigned number
 
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
+# Whether to align macros wrapped with a backslash and a newline.
+# This will not work right if the macro contains a multi-line comment.
+align_nl_cont                   = false    # false/true
 
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
+# # Align macro functions and variables together.
+align_pp_define_together        = false    # false/true
 
 # The minimum space between label and value of a preprocessor define.
 align_pp_define_gap             = 0        # unsigned number
 
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
+# The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks)
 align_pp_define_span            = 0        # unsigned number
 
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
+# Align lines that start with '<<' with previous '<<'. Default=True.
+align_left_shift                = true     # false/true
 
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
+# Align text after asm volatile () colons.
+align_asm_colon                 = false    # false/true
 
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0 = Don't align.
+# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align)
 align_oc_msg_colon_span         = 0        # unsigned number
 
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
+# If True, always align with the first parameter, even if it is too short.
+align_oc_msg_colon_first        = false    # false/true
 
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
+# Aligning parameters in an Obj-C '+' or '-' declaration on the ':'.
+align_oc_decl_colon             = false    # false/true
 
 #
-# Comment modification options
+# Comment modifications
 #
 
-# Try to wrap comments at N columns.
+# Try to wrap comments at cmt_width columns
 cmt_width                       = 0        # unsigned number
 
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow
+# Set the comment reflow mode (Default=0)
+# 0: no reflowing (apart from the line wrapping due to cmt_width)
+# 1: no touching at all
+# 2: full reflow
 cmt_reflow_mode                 = 0        # unsigned number
 
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
+# Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting.
+cmt_convert_tab_to_spaces       = false    # false/true
 
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
+# If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars.
+# Default=True.
+cmt_indent_multi                = true     # false/true
 
 # Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
+cmt_c_group                     = false    # false/true
 
 # Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
+cmt_c_nl_start                  = false    # false/true
 
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
+# Whether to put a newline before the closing '*/' of the combined c-comment.
+cmt_c_nl_end                    = false    # false/true
 
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
+# Whether to group cpp-comments that look like they are in a block.
+cmt_cpp_group                   = false    # false/true
 
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
+# Whether to put an empty '/*' on the first line of the combined cpp-comment.
+cmt_cpp_nl_start                = false    # false/true
 
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
+# Whether to put a newline before the closing '*/' of the combined cpp-comment.
+cmt_cpp_nl_end                  = false    # false/true
 
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
+# Whether to change cpp-comments into c-comments.
+cmt_cpp_to_c                    = false    # false/true
 
 # Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
+cmt_star_cont                   = false    # false/true
 
 # The number of spaces to insert at the start of subsequent comment lines.
 cmt_sp_before_star_cont         = 0        # unsigned number
 
 # The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
+cmt_sp_after_star_cont          = 0        # number
 
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
+# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+# the comment are the same length. Default=True.
+cmt_multi_check_last            = true     # false/true
 
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
+# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+# the comment are the same length AND if the length is bigger as the first_len minimum. Default=4
 cmt_multi_first_len_minimum     = 4        # unsigned number
 
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
+# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.
+# Will substitute $(filename) with the current file's name.
 cmt_insert_file_header          = ""         # string
 
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
+# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.
+# Will substitute $(filename) with the current file's name.
 cmt_insert_file_footer          = ""         # string
 
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
+# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
+# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
+# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }.
 cmt_insert_func_header          = ""         # string
 
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
+# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.
+# Will substitute $(class) with the class name.
 cmt_insert_class_header         = ""         # string
 
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
+# The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment.
+# Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.
 cmt_insert_oc_msg_header        = ""         # string
 
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
+# If a preprocessor is encountered when stepping backwards from a function name, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header.
+cmt_insert_before_preproc       = false    # false/true
+
+# If a function is declared inline to a class definition, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_func_header.
+cmt_insert_before_inlines       = true     # false/true
+
+# If the function is a constructor/destructor, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_func_header.
+cmt_insert_before_ctor_dtor     = false    # false/true
 
 #
 # Code modifying options (non-whitespace)
 #
 
-# Add or remove braces on a single-line 'do' statement.
+# Add or remove braces on single-line 'do' statement.
 mod_full_brace_do               = ignore   # ignore/add/remove/force
 
-# Add or remove braces on a single-line 'for' statement.
+# Add or remove braces on single-line 'for' statement.
 mod_full_brace_for              = ignore   # ignore/add/remove/force
 
-# (Pawn) Add or remove braces on a single-line function definition.
+# Add or remove braces on single-line function definitions. (Pawn).
 mod_full_brace_function         = ignore   # ignore/add/remove/force
 
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
+# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
 mod_full_brace_if               = ignore   # ignore/add/remove/force
 
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
+# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
+# If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
+mod_full_brace_if_chain         = false    # false/true
+
+# Make all if/elseif/else statements with at least one 'else' or 'else if' fully braced.
+# If mod_full_brace_if_chain is used together with this option, all if-else chains will get braces,
+# and simple 'if' statements will lose them (if possible).
+mod_full_brace_if_chain_only    = false    # false/true
+
+# Don't remove braces around statements that span N newlines
+mod_full_brace_nl               = 0        # unsigned number
+
+# Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines.
+mod_full_brace_nl_block_rem_mlcond = false    # false/true
 
 # Add or remove braces on single-line 'while' statement.
 mod_full_brace_while            = ignore   # ignore/add/remove/force
@@ -2422,192 +2004,142 @@
 # Add or remove braces on single-line 'using ()' statement.
 mod_full_brace_using            = ignore   # ignore/add/remove/force
 
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
+# Add or remove unnecessary paren on 'return' statement.
 mod_paren_on_return             = ignore   # ignore/add/remove/force
 
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
+# Whether to change optional semicolons to real semicolons.
+mod_pawn_semicolon              = false    # false/true
 
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' → 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
+# Add parens on 'while' and 'if' statement around bools.
+mod_full_paren_if_bool          = false    # false/true
 
 # Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
+mod_remove_extra_semicolon      = false    # false/true
 
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
+# If a function body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_function_closebrace_comment = 0        # unsigned number
 
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
+# If a namespace body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_namespace_closebrace_comment = 0        # unsigned number
 
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
+# If a class body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_class_closebrace_comment = 0        # unsigned number
 
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
+# If a switch body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_switch_closebrace_comment = 0        # unsigned number
 
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
+# If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after
+# the #endif, a comment will be added.
 mod_add_long_ifdef_endif_comment = 0        # unsigned number
 
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
+# If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after
+# the #else, a comment will be added.
 mod_add_long_ifdef_else_comment = 0        # unsigned number
 
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
+# If True, will sort consecutive single-line 'import' statements [Java, D].
+mod_sort_import                 = false    # false/true
+
+# If True, will sort consecutive single-line 'using' statements [C#].
+mod_sort_using                  = false    # false/true
 
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
+# If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]
+# This is generally a bad idea, as it may break your code.
+mod_sort_include                = false    # false/true
 
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' → 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
+# If True, it will move a 'break' that appears after a fully braced 'case' before the close brace.
+mod_move_case_break             = false    # false/true
 
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
+# Will add or remove the braces around a fully braced case statement.
+# Will only remove the braces if there are no variable declarations in the block.
 mod_case_brace                  = ignore   # ignore/add/remove/force
 
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
+# If True, it will remove a void 'return;' that appears as the last statement in a function.
+mod_remove_empty_return         = false    # false/true
 
-# (OC) Weight of a class property modifier.
+# If True, it will organize the properties (Obj-C).
+mod_sort_oc_properties          = false    # false/true
+
+# Determines weight of class property modifier (Obj-C).
 mod_sort_oc_property_class_weight = 0        # number
 
-# (OC) Weight of 'atomic' and 'nonatomic'.
+# Determines weight of atomic, nonatomic (Obj-C).
 mod_sort_oc_property_thread_safe_weight = 0        # number
 
-# (OC) Weight of 'readwrite' when organizing properties.
+# Determines weight of readwrite (Obj-C).
 mod_sort_oc_property_readwrite_weight = 0        # number
 
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
+# Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C).
 mod_sort_oc_property_reference_weight = 0        # number
 
-# (OC) Weight of getter type ('getter=') when organizing properties.
+# Determines weight of getter type (getter=) (Obj-C).
 mod_sort_oc_property_getter_weight = 0        # number
 
-# (OC) Weight of setter type ('setter=') when organizing properties.
+# Determines weight of setter type (setter=) (Obj-C).
 mod_sort_oc_property_setter_weight = 0        # number
 
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
+# Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C).
 mod_sort_oc_property_nullability_weight = 0        # number
 
 #
 # Preprocessor options
 #
 
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
+# Control indent of preprocessors inside #if blocks at brace level 0 (file-level).
 pp_indent                       = ignore   # ignore/add/remove/force
 
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
+# Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False).
+pp_indent_at_level              = false    # false/true
+
+# Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
+# If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
+# Default=1.
 pp_indent_count                 = 1        # unsigned number
 
 # Add or remove space after # based on pp_level of #if blocks.
 pp_space                        = ignore   # ignore/add/remove/force
 
-# Sets the number of spaces per level added with pp_space.
+# Sets the number of spaces added with pp_space.
 pp_space_count                  = 0        # unsigned number
 
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
+# The indent for #region and #endregion in C# and '#pragma region' in C/C++.
 pp_indent_region                = 0        # number
 
 # Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
+pp_region_indent_code           = false    # false/true
 
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
+# If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level.
+# 0:  indent preprocessors using output_tab_size.
+# >0: column at which all preprocessors will be indented.
 pp_indent_if                    = 0        # number
 
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
+# Control whether to indent the code between #if, #else and #endif.
+pp_if_indent_code               = false    # false/true
 
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
+# Whether to indent '#define' at the brace level (True) or from column 1 (false).
+pp_define_at_level              = false    # false/true
 
 # Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
+pp_ignore_define_body           = false    # false/true
 
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
+# Only applies to the indent of the preprocesser that the case statements directly inside of.
+pp_indent_case                  = true     # false/true
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
+# Only applies to the indent of the preprocesser that the function definition is directly inside of.
+pp_indent_func_def              = true     # false/true
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
+# Only applies to the indent of the preprocesser that the extern block is directly inside of.
+pp_indent_extern                = true     # false/true
 
 # Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
+# Only applies to the indent of the preprocesser that the braces are directly inside of.
+pp_indent_brace                 = true     # false/true
 
 #
 # Sort includes options
@@ -2626,58 +2158,38 @@
 # Use or Do not Use options
 #
 
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
+# True:  indent_func_call_param will be used (default)
+# False: indent_func_call_param will NOT be used.
+use_indent_func_call_param      = true     # false/true
+
+# The value of the indentation for a continuation line is calculate differently if the statement is:
+#   a declaration: your case with QString fileName ...
+#   an assignment: your case with pSettings = new QSettings( ...
 # At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
+#   at the assignment
+#   at the function call (if present)
+# To prevent the double use of the indentation value, use this option with the value 'True'.
+# True:  indent_continue will be used only once
+# False: indent_continue will be used every time (default).
+use_indent_continue_only_once   = false    # false/true
+
+# the value might be used twice:
+#   at the assignment
+#   at the opening brace
+# To prevent the double use of the indentation value, use this option with the value 'True'.
+# True:  indentation will be used only once
+# False: indentation will be used every time (default).
+indent_cpp_lambda_only_once     = false    # false/true
+
+# SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details.
+# Default=True.
+use_options_overriding_for_qt_macros = true     # false/true
 
 #
 # Warn levels - 1: error, 2: warning (default), 3: note
 #
 
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
+# Warning is given if doing tab-to-\t replacement and we have found one in a C# verbatim string literal.
 warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 
 # Meaning of the settings:
@@ -2695,7 +2207,7 @@
 #       `set BOOL __AND__ __OR__`
 #
 #     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' → 'BOOL'
+#     'CT_' prefix: 'CT_BOOL' -> 'BOOL'
 #
 #
 # - Token(s) can be treated as type(s) with the 'type' option.
@@ -2719,7 +2231,7 @@
 #       `file_ext CPP .ch .cxx .cpp.in`
 #
 #     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' → 'CPP'
+#     them without the 'LANG_' prefix: 'LANG_CPP' -> 'CPP'
 #
 #
 # - Custom macro-based indentation can be set up using 'macro-open',
diff -ru orig/uncrustify-uncrustify-0.68.1/etc/defaults.cfg new/uncrustify-uncrustify-0.68.1/etc/defaults.cfg
--- orig/uncrustify-uncrustify-0.68.1/etc/defaults.cfg	2018-11-20 18:04:30.000000000 +0100
+++ new/uncrustify-uncrustify-0.68.1/etc/defaults.cfg	2018-11-22 09:59:35.000000000 +0100
@@ -1,85 +1,65 @@
-# Uncrustify-0.68
+# Uncrustify-0.67
 
 #
 # General options
 #
 
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
+# The type of line endings. Default=Auto.
+newlines                        = auto     # auto/lf/crlf/cr
 
-# The original size of tabs in the input.
-#
-# Default: 8
+# The original size of tabs in the input. Default=8.
 input_tab_size                  = 8        # unsigned number
 
-# The size of tabs in the output (only used if align_with_tabs=true).
-#
-# Default: 8
+# The size of tabs in the output (only used if align_with_tabs=true). Default=8.
 output_tab_size                 = 8        # unsigned number
 
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
+# The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn).
 string_escape_char              = 92       # unsigned number
 
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
+# Alternate string escape char for Pawn. Only works right before the quote char.
 string_escape_char2             = 0        # unsigned number
 
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
+# Replace tab characters found in string literals with the escape sequence \t instead.
+string_replace_tab_chars        = false    # false/true
 
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
+# Allow interpreting '>=' and '>>=' as part of a template in 'void f(list<list<B>>=val);'.
+# If True, 'assert(x<0 && y>=3)' will be broken. Default=False
 # Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
+tok_split_gte                   = false    # false/true
 
-# Specify the marker used in comments to disable processing of part of the
-# file.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
+# Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file.
+disable_processing_cmt          = ""         # string
 
-# Specify the marker used in comments to (re)enable processing in a file.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
+# Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file.
+enable_processing_cmt           = ""         # string
 
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
+# Enable parsing of digraphs. Default=False.
+enable_digraphs                 = false    # false/true
 
-# Add or remove the UTF-8 BOM (recommend 'remove').
+# Control what to do with the UTF-8 BOM (recommend 'remove').
 utf8_bom                        = ignore   # ignore/add/remove/force
 
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
+# If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8.
+utf8_byte                       = false    # false/true
 
 # Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
+utf8_force                      = false    # false/true
 
 #
 # Spacing options
 #
 
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
+# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
+# also '>>>' '<<' '>>' '%' '|'.
 sp_arith                        = ignore   # ignore/add/remove/force
 
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
+# Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith
 sp_arith_additive               = ignore   # ignore/add/remove/force
 
 # Add or remove space around assignment operator '=', '+=', etc.
 sp_assign                       = ignore   # ignore/add/remove/force
 
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
+# Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign.
 sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force
 
 # Add or remove space after the capture specification in C++11 lambda.
@@ -88,14 +68,10 @@
 # Add or remove space around assignment operator '=' in a prototype.
 sp_assign_default               = ignore   # ignore/add/remove/force
 
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
+# Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.
 sp_before_assign                = ignore   # ignore/add/remove/force
 
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
+# Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.
 sp_after_assign                 = ignore   # ignore/add/remove/force
 
 # Add or remove space in 'NS_ENUM ('.
@@ -104,30 +80,22 @@
 # Add or remove space around assignment '=' in enum.
 sp_enum_assign                  = ignore   # ignore/add/remove/force
 
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
+# Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.
 sp_enum_before_assign           = ignore   # ignore/add/remove/force
 
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
+# Add or remove space after assignment '=' in enum. Overrides sp_enum_assign.
 sp_enum_after_assign            = ignore   # ignore/add/remove/force
 
 # Add or remove space around assignment ':' in enum.
 sp_enum_colon                   = ignore   # ignore/add/remove/force
 
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
+# Add or remove space around preprocessor '##' concatenation operator. Default=Add.
 sp_pp_concat                    = add      # ignore/add/remove/force
 
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
+# Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator.
 sp_pp_stringify                 = ignore   # ignore/add/remove/force
 
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
+# Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'.
 sp_before_pp_stringify          = ignore   # ignore/add/remove/force
 
 # Add or remove space around boolean operators '&&' and '||'.
@@ -139,26 +107,23 @@
 # Add or remove space inside '(' and ')'.
 sp_inside_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
+# Add or remove space between nested parens: '((' vs ') )'.
 sp_paren_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
+# Add or remove space between back-to-back parens: ')(' vs ') ('.
 sp_cparen_oparen                = ignore   # ignore/add/remove/force
 
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
+# Whether to balance spaces inside nested parens.
+sp_balance_nested_parens        = false    # false/true
 
 # Add or remove space between ')' and '{'.
 sp_paren_brace                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
-
 # Add or remove space before pointer star '*'.
 sp_before_ptr_star              = ignore   # ignore/add/remove/force
 
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to 'ignore', sp_before_ptr_star is used instead.
+# Add or remove space before pointer star '*' that isn't followed by a variable name
+# If set to 'ignore', sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
 
 # Add or remove space between pointer stars '*'.
@@ -173,118 +138,97 @@
 # Add or remove space after pointer star '*', if followed by a qualifier.
 sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force
 
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
+# Add or remove space after a pointer star '*', if followed by a func proto/def.
 sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
 
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
+# Add or remove space after a pointer star '*', if followed by an open paren (function types).
 sp_ptr_star_paren               = ignore   # ignore/add/remove/force
 
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
+# Add or remove space before a pointer star '*', if followed by a func proto/def.
 sp_before_ptr_star_func         = ignore   # ignore/add/remove/force
 
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore   # ignore/add/remove/force
 
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to 'ignore', sp_before_byref is used instead.
+# Add or remove space before a reference sign '&' that isn't followed by a variable name.
+# If set to 'ignore', sp_before_byref is used instead.
 sp_before_unnamed_byref         = ignore   # ignore/add/remove/force
 
 # Add or remove space after reference sign '&', if followed by a word.
 sp_after_byref                  = ignore   # ignore/add/remove/force
 
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
+# Add or remove space after a reference sign '&', if followed by a func proto/def.
 sp_after_byref_func             = ignore   # ignore/add/remove/force
 
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
+# Add or remove space before a reference sign '&', if followed by a func proto/def.
 sp_before_byref_func            = ignore   # ignore/add/remove/force
 
-# Add or remove space between type and word.
-#
-# Default: force
+# Add or remove space between type and word. Default=Force.
 sp_after_type                   = force    # ignore/add/remove/force
 
-# Add or remove space between 'decltype(...)' and word.
-sp_after_decltype               = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
+# Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('.
 sp_before_template_paren        = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'template' and '<'.
+# Add or remove space in 'template <' vs 'template<'.
 # If set to ignore, sp_before_angle is used.
 sp_template_angle               = ignore   # ignore/add/remove/force
 
-# Add or remove space before '<'.
+# Add or remove space before '<>'.
 sp_before_angle                 = ignore   # ignore/add/remove/force
 
 # Add or remove space inside '<' and '>'.
 sp_inside_angle                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and ':'.
+# Add or remove space between '<>' and ':'.
 sp_angle_colon                  = ignore   # ignore/add/remove/force
 
 # Add or remove space after '<>'.
 sp_after_angle                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
+# Add or remove space between '<>' and '(' as found in 'new List<byte>(foo);'.
 sp_angle_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
+# Add or remove space between '<>' and '()' as found in 'new List<byte>();'.
 sp_angle_paren_empty            = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and a word as in 'List<byte> m;' or
-# 'template <typename T> static ...'.
+# Add or remove space between '<>' and a word as in 'List<byte> m;' or 'template <typename T> static ...'.
 sp_angle_word                   = ignore   # ignore/add/remove/force
 
-# Add or remove space between '>' and '>' in '>>' (template stuff).
-#
-# Default: add
+# Add or remove space between '>' and '>' in '>>' (template stuff). Default=Add.
 sp_angle_shift                  = add      # ignore/add/remove/force
 
-# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
-# that sp_angle_shift cannot remove the space without this option.
-sp_permit_cpp11_shift           = false    # true/false
+# Permit removal of the space between '>>' in 'foo<bar<int> >' (C++11 only). Default=False.
+# sp_angle_shift cannot remove the space without this option.
+sp_permit_cpp11_shift           = false    # false/true
 
-# Add or remove space before '(' of control statements ('if', 'for', 'switch',
-# 'while', etc.).
+# Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc.
 sp_before_sparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space inside '(' and ')' of control statements.
+# Add or remove space inside if-condition '(' and ')'.
 sp_inside_sparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
+# Add or remove space before if-condition ')'. Overrides sp_inside_sparen.
 sp_inside_sparen_close          = ignore   # ignore/add/remove/force
 
-# Add or remove space after ')' of control statements.
+# Add or remove space after if-condition '('. Overrides sp_inside_sparen.
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+
+# Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc.
 sp_after_sparen                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between ')' and '{' of of control statements.
+# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc.
 sp_sparen_brace                 = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'invariant' and '('.
+# Add or remove space between 'invariant' and '(' in the D language.
 sp_invariant_paren              = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
+# Add or remove space after the ')' in 'invariant (C) c' in the D language.
 sp_after_invariant_paren        = ignore   # ignore/add/remove/force
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
 sp_special_semi                 = ignore   # ignore/add/remove/force
 
-# Add or remove space before ';'.
-#
-# Default: remove
+# Add or remove space before ';'. Default=Remove.
 sp_before_semi                  = remove   # ignore/add/remove/force
 
 # Add or remove space before ';' in non-empty 'for' statements.
@@ -293,18 +237,13 @@
 # Add or remove space before a semicolon of an empty part of a for statement.
 sp_before_semi_for_empty        = ignore   # ignore/add/remove/force
 
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
+# Add or remove space after ';', except when followed by a comment. Default=Add.
 sp_after_semi                   = add      # ignore/add/remove/force
 
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
+# Add or remove space after ';' in non-empty 'for' statements. Default=Force.
 sp_after_semi_for               = force    # ignore/add/remove/force
 
-# Add or remove space after the final semicolon of an empty part of a for
-# statement, as in 'for ( ; ; <here> )'.
+# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; <here> ).
 sp_after_semi_for_empty         = ignore   # ignore/add/remove/force
 
 # Add or remove space before '[' (except '[]').
@@ -313,52 +252,37 @@
 # Add or remove space before '[]'.
 sp_before_squares               = ignore   # ignore/add/remove/force
 
-# Add or remove space before C++17 structured bindings.
+# Add or remove space before structured bindings. Only for C++17.
 sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
 
 # Add or remove space inside a non-empty '[' and ']'.
 sp_inside_square                = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
+# Add or remove space inside a non-empty OC boxed array '@[' and ']'.
+# If set to ignore, sp_inside_square is used.
 sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
 
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
+# Add or remove space after ',', 'a,b' vs 'a, b'.
 sp_after_comma                  = ignore   # ignore/add/remove/force
 
-# Add or remove space before ','.
-#
-# Default: remove
+# Add or remove space before ','. Default=Remove.
 sp_before_comma                 = remove   # ignore/add/remove/force
 
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
+# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#.
 sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
 
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
+# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#.
 sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
 
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
+# Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#.
 sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
 
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
+# Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force.
 sp_paren_comma                  = force    # ignore/add/remove/force
 
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
+# Add or remove space before the variadic '...' when preceded by a non-punctuator.
 sp_before_ellipsis              = ignore   # ignore/add/remove/force
 
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
-
 # Add or remove space after class ':'.
 sp_after_class_colon            = ignore   # ignore/add/remove/force
 
@@ -371,46 +295,31 @@
 # Add or remove space before class constructor ':'.
 sp_before_constr_colon          = ignore   # ignore/add/remove/force
 
-# Add or remove space before case ':'.
-#
-# Default: remove
+# Add or remove space before case ':'. Default=Remove.
 sp_before_case_colon            = remove   # ignore/add/remove/force
 
 # Add or remove space between 'operator' and operator sign.
 sp_after_operator               = ignore   # ignore/add/remove/force
 
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
+# Add or remove space between the operator symbol and the open paren, as in 'operator ++('.
 sp_after_operator_sym           = ignore   # ignore/add/remove/force
 
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
+# Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'.
 sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force
 
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
+# Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'.
 sp_after_cast                   = ignore   # ignore/add/remove/force
 
-# Add or remove spaces inside cast parentheses.
+# Add or remove spaces inside cast parens.
 sp_inside_paren_cast            = ignore   # ignore/add/remove/force
 
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
+# Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'.
 sp_cpp_cast_paren               = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'sizeof' and '('.
 sp_sizeof_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
-
-# (Pawn) Add or remove space after the tag keyword.
+# Add or remove space after the tag keyword (Pawn).
 sp_after_tag                    = ignore   # ignore/add/remove/force
 
 # Add or remove space inside enum '{' and '}'.
@@ -419,15 +328,13 @@
 # Add or remove space inside struct/union '{' and '}'.
 sp_inside_braces_struct         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
+# Add or remove space inside OC boxed dictionary @'{' and '}'
 sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
 
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
+# Add or remove space after open brace in an unnamed temporary direct-list-initialization.
 sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force
 
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
+# Add or remove space before close brace in an unnamed temporary direct-list-initialization.
 sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
@@ -439,26 +346,23 @@
 # Add or remove space inside '{}'.
 sp_inside_braces_empty          = ignore   # ignore/add/remove/force
 
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
+# Add or remove space between return type and function name
+# A minimum of 1 is forced except for pointer return types.
 sp_type_func                    = ignore   # ignore/add/remove/force
 
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
+# Add or remove space between type and open brace of an unnamed temporary direct-list-initialization.
 sp_type_brace_init_lst          = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function declaration.
 sp_func_proto_paren             = ignore   # ignore/add/remove/force
 
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
+# Add or remove space between function name and '()' on function declaration without parameters.
 sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function definition.
 sp_func_def_paren               = ignore   # ignore/add/remove/force
 
-# Add or remove space between function name and '()' on function definition
-# without parameters.
+# Add or remove space between function name and '()' on function definition without parameters.
 sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
 
 # Add or remove space inside empty function '()'.
@@ -467,12 +371,10 @@
 # Add or remove space inside function '(' and ')'.
 sp_inside_fparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
+# Add or remove space inside the first parens in the function type: 'void (*x)(...)'.
 sp_inside_tparen                = ignore   # ignore/add/remove/force
 
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
+# Add or remove between the parens in the function type: 'void (*x)(...)'.
 sp_after_tparen_close           = ignore   # ignore/add/remove/force
 
 # Add or remove space between ']' and '(' when part of a function call.
@@ -481,49 +383,39 @@
 # Add or remove space between ')' and '{' of function.
 sp_fparen_brace                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between ')' and '{' of s function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
+# Add or remove space between ')' and '{' of function call in object initialization. Overrides sp_fparen_brace.
 sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
 
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
+# Java: Add or remove space between ')' and '{{' of double brace initializer.
 sp_fparen_dbrace                = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function calls.
 sp_func_call_paren              = ignore   # ignore/add/remove/force
 
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to 'ignore' (the default), sp_func_call_paren is used.
+# Add or remove space between function name and '()' on function calls without parameters.
+# If set to 'ignore' (the default), sp_func_call_paren is used.
 sp_func_call_paren_empty        = ignore   # ignore/add/remove/force
 
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
+# Add or remove space between the user function name and '(' on function calls
+# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 sp_func_call_user_paren         = ignore   # ignore/add/remove/force
 
-# Add or remove space inside user function '(' and ')'.
+# Add or remove space inside user function '(' and ')'
+# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
 
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
+# Add or remove space between nested parens with user functions: '((' vs ') )'You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
 sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force
 
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
+# Add or remove space between a constructor/destructor and the open paren.
 sp_func_class_paren             = ignore   # ignore/add/remove/force
 
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
+# Add or remove space between a constructor without parameters or destructor and '()'.
 sp_func_class_paren_empty       = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'return' and '('.
 sp_return_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
-
 # Add or remove space between '__attribute__' and '('.
 sp_attribute_paren              = ignore   # ignore/add/remove/force
 
@@ -533,40 +425,35 @@
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
 sp_throw_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
+# Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'.
 sp_after_throw                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
+# Add or remove space between 'catch' and '(' in 'catch (something) { }'
 # If set to ignore, sp_before_sparen is used.
 sp_catch_paren                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
+# Add or remove space between '@catch' and '(' in '@catch (something) { }'
+# If set to ignore, sp_catch_paren is used.
 sp_oc_catch_paren               = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
+# Add or remove space between 'version' and '(' in 'version (something) { }' (D language)
+# If set to ignore, sp_before_sparen is used.
 sp_version_paren                = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
+# Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language)
+# If set to ignore, sp_before_sparen is used.
 sp_scope_paren                  = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
+# Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove.
 sp_super_paren                  = remove   # ignore/add/remove/force
 
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
+# Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove.
 sp_this_paren                   = remove   # ignore/add/remove/force
 
-# Add or remove space between a macro name and its definition.
+# Add or remove space between macro and value.
 sp_macro                        = ignore   # ignore/add/remove/force
 
-# Add or remove space between a macro function ')' and its definition.
+# Add or remove space between macro function ')' and value.
 sp_macro_func                   = ignore   # ignore/add/remove/force
 
 # Add or remove space between 'else' and '{' if on the same line.
@@ -578,19 +465,17 @@
 # Add or remove space between '}' and the name of a typedef on the same line.
 sp_brace_typedef                = ignore   # ignore/add/remove/force
 
-# Add or remove space before the '{' of a 'catch' statement, if the '{' and
-# 'catch' are on the same line, as in 'catch (decl) <here> {'.
+# Add or remove space between 'catch' and '{' if on the same line.
 sp_catch_brace                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
+# Add or remove space between '@catch' and '{' if on the same line.
 # If set to ignore, sp_catch_brace is used.
 sp_oc_catch_brace               = ignore   # ignore/add/remove/force
 
 # Add or remove space between '}' and 'catch' if on the same line.
 sp_brace_catch                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
+# Add or remove space between '}' and '@catch' if on the same line.
 # If set to ignore, sp_brace_catch is used.
 sp_oc_brace_catch               = ignore   # ignore/add/remove/force
 
@@ -606,15 +491,10 @@
 # Add or remove space between get/set and '{' if on the same line.
 sp_getset_brace                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-#
-# Default: add
+# Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add.
 sp_word_brace                   = add      # ignore/add/remove/force
 
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
+# Add or remove space between a variable and '{' for a namespace. Default=Add.
 sp_word_brace_ns                = add      # ignore/add/remove/force
 
 # Add or remove space before the '::' operator.
@@ -623,714 +503,595 @@
 # Add or remove space after the '::' operator.
 sp_after_dc                     = ignore   # ignore/add/remove/force
 
-# (D) Add or remove around the D named array initializer ':' operator.
+# Add or remove around the D named array initializer ':' operator.
 sp_d_array_colon                = ignore   # ignore/add/remove/force
 
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
+# Add or remove space after the '!' (not) operator. Default=Remove.
 sp_not                          = remove   # ignore/add/remove/force
 
-# Add or remove space after the '~' (invert) unary operator.
-#
-# Default: remove
+# Add or remove space after the '~' (invert) operator. Default=Remove.
 sp_inv                          = remove   # ignore/add/remove/force
 
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
-#
-# Default: remove
+# Add or remove space after the '&' (address-of) operator. Default=Remove
+# This does not affect the spacing after a '&' that is part of a type.
 sp_addr                         = remove   # ignore/add/remove/force
 
-# Add or remove space around the '.' or '->' operators.
-#
-# Default: remove
+# Add or remove space around the '.' or '->' operators. Default=Remove.
 sp_member                       = remove   # ignore/add/remove/force
 
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
+# Add or remove space after the '*' (dereference) operator. Default=Remove
+# This does not affect the spacing after a '*' that is part of a type.
 sp_deref                        = remove   # ignore/add/remove/force
 
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
+# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove.
 sp_sign                         = remove   # ignore/add/remove/force
 
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
-#
-# Default: remove
+# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove.
 sp_incdec                       = remove   # ignore/add/remove/force
 
-# Add or remove space before a backslash-newline at the end of a line.
-#
-# Default: add
+# Add or remove space before a backslash-newline at the end of a line. Default=Add.
 sp_before_nl_cont               = add      # ignore/add/remove/force
 
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
+# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'.
 sp_after_oc_scope               = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
+# Add or remove space after the colon in message specs
+# '-(int) f:(int) x;' vs '-(int) f: (int) x;'.
 sp_after_oc_colon               = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
+# Add or remove space before the colon in message specs
+# '-(int) f: (int) x;' vs '-(int) f : (int) x;'.
 sp_before_oc_colon              = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the colon in immutable dictionary expression
+# Add or remove space after the colon in immutable dictionary expression
 # 'NSDictionary *test = @{@"foo" :@"bar"};'.
 sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the colon in immutable dictionary expression
+# Add or remove space before the colon in immutable dictionary expression
 # 'NSDictionary *test = @{@"foo" :@"bar"};'.
 sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
+# Add or remove space after the colon in message specs
+# '[object setValue:1];' vs '[object setValue: 1];'.
 sp_after_send_oc_colon          = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
+# Add or remove space before the colon in message specs
+# '[object setValue:1];' vs '[object setValue :1];'.
 sp_before_send_oc_colon         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
+# Add or remove space after the (type) in message specs
+# '-(int)f: (int) x;' vs '-(int)f: (int)x;'.
 sp_after_oc_type                = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
+# Add or remove space after the first (type) in message specs
+# '-(int) f:(int)x;' vs '-(int)f:(int)x;'.
 sp_after_oc_return_type         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
+# Add or remove space between '@selector' and '('
+# '@selector(msgName)' vs '@selector (msgName)'
+# Also applies to @protocol() constructs.
 sp_after_oc_at_sel              = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
+# Add or remove space between '@selector(x)' and the following word
+# '@selector(foo) a:' vs '@selector(foo)a:'.
 sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
+# Add or remove space inside '@selector' parens
+# '@selector(foo)' vs '@selector( foo )'
+# Also applies to @protocol() constructs.
 sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
+# Add or remove space before a block pointer caret
+# '^int (int arg){...}' vs. ' ^int (int arg){...}'.
 sp_before_oc_block_caret        = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
+# Add or remove space after a block pointer caret
+# '^int (int arg){...}' vs. '^ int (int arg){...}'.
 sp_after_oc_block_caret         = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
+# Add or remove space between the receiver and selector in a message.
+# '[receiver selector ...]'.
 sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space after '@property'.
+# Add or remove space after @property.
 sp_after_oc_property            = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
+# Add or remove space between '@synchronized' and the parenthesis
+# '@synchronized(foo)' vs '@synchronized (foo)'.
 sp_after_oc_synchronized        = ignore   # ignore/add/remove/force
 
 # Add or remove space around the ':' in 'b ? t : f'.
 sp_cond_colon                   = ignore   # ignore/add/remove/force
 
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
+# Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon.
 sp_cond_colon_before            = ignore   # ignore/add/remove/force
 
-# Add or remove space after the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
+# Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon.
 sp_cond_colon_after             = ignore   # ignore/add/remove/force
 
 # Add or remove space around the '?' in 'b ? t : f'.
 sp_cond_question                = ignore   # ignore/add/remove/force
 
-# Add or remove space before the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
+# Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question.
 sp_cond_question_before         = ignore   # ignore/add/remove/force
 
-# Add or remove space after the '?' in 'b ? t : f'.
-#
-# Overrides sp_cond_question.
+# Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question.
 sp_cond_question_after          = ignore   # ignore/add/remove/force
 
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
+# In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options.
 sp_cond_ternary_short           = ignore   # ignore/add/remove/force
 
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
+# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
 sp_case_label                   = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space around the D '..' operator.
+# Control the space around the D '..' operator.
 sp_range                        = ignore   # ignore/add/remove/force
 
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
+# Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.
 sp_after_for_colon              = ignore   # ignore/add/remove/force
 
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
+# Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.
 sp_before_for_colon             = ignore   # ignore/add/remove/force
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
+# Control the spacing in 'extern (C)' (D).
 sp_extern_paren                 = ignore   # ignore/add/remove/force
 
-# Add or remove space after the opening of a C++ comment,
-# i.e. '// A' vs. '//A'.
+# Control the space after the opening of a C++ comment '// A' vs '//A'.
 sp_cmt_cpp_start                = ignore   # ignore/add/remove/force
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space is added with sp_cmt_cpp_start will be added after Qt
-# translator or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
+# True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'.
+sp_cmt_cpp_doxygen              = false    # false/true
+
+# True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'.
+sp_cmt_cpp_qttr                 = false    # false/true
 
-# Add or remove space between #else or #endif and a trailing comment.
+# Controls the spaces between #else or #endif and a trailing comment.
 sp_endif_cmt                    = ignore   # ignore/add/remove/force
 
-# Add or remove space after 'new', 'delete' and 'delete[]'.
+# Controls the spaces after 'new', 'delete' and 'delete[]'.
 sp_after_new                    = ignore   # ignore/add/remove/force
 
-# Add or remove space between 'new' and '(' in 'new()'.
+# Controls the spaces between new and '(' in 'new()'.
 sp_between_new_paren            = ignore   # ignore/add/remove/force
 
-# Add or remove space between ')' and type in 'new(foo) BAR'.
+# Controls the spaces between ')' and 'type' in 'new(foo) BAR'.
 sp_after_newop_paren            = ignore   # ignore/add/remove/force
 
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
+# Controls the spaces inside paren of the new operator: 'new(foo) BAR'.
 sp_inside_newop_paren           = ignore   # ignore/add/remove/force
 
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
+# Controls the space after open paren of the new operator: 'new(foo) BAR'.
 # Overrides sp_inside_newop_paren.
 sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force
 
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
+# Controls the space before close paren of the new operator: 'new(foo) BAR'.
 # Overrides sp_inside_newop_paren.
 sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force
 
-# Add or remove space before a trailing or embedded comment.
+# Controls the spaces before a trailing or embedded comment.
 sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force
 
 # Number of spaces before a trailing or embedded comment.
 sp_num_before_tr_emb_cmt        = 0        # unsigned number
 
-# (Java) Add or remove space between an annotation and the open parenthesis.
+# Control space between a Java annotation and the open paren.
 sp_annotation_paren             = ignore   # ignore/add/remove/force
 
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
+# If True, vbrace tokens are dropped to the previous token and skipped.
+sp_skip_vbrace_tokens           = false    # false/true
 
-# Add or remove space after 'noexcept'.
+# Controls the space after 'noexcept'.
 sp_after_noexcept               = ignore   # ignore/add/remove/force
 
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
+# If True, a <TAB> is inserted after #define.
+force_tab_after_define          = false    # false/true
 
 #
-# Indenting options
+# Indenting
 #
 
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
+# The number of columns to indent per level.
+# Usually 2, 3, 4, or 8. Default=8.
 indent_columns                  = 8        # unsigned number
 
-# The continuation indent. If non-zero, this overrides the indent of '(' and
-# '=' continuation indents. Negative values are OK; negative value is absolute
-# and not increased for each '(' level.
-#
-# For FreeBSD, this is set to 4.
+# The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.
+# For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level.
 indent_continue                 = 0        # number
 
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
+# Indent empty lines - lines which contain only spaces before newline character
+indent_single_newlines          = false    # false/true
 
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
+# The continuation indent for func_*_param if they are true.
+# If non-zero, this overrides the indent.
 indent_param                    = 0        # unsigned number
 
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
+# How to use tabs when indenting code
+# 0=spaces only
+# 1=indent with tabs to brace level, align with spaces (default)
+# 2=indent and align with tabs, using spaces when not on a tabstop
 indent_with_tabs                = 1        # unsigned number
 
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
+# Comments that are not a brace level are indented with tabs on a tabstop.
+# Requires indent_with_tabs=2. If false, will use spaces.
+indent_cmt_with_tabs            = false    # false/true
 
 # Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
+indent_align_string             = false    # false/true
 
 # The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
+# Requires indent_align_string=True.
 indent_xml_string               = 0        # unsigned number
 
 # Spaces to indent '{' from level.
 indent_brace                    = 0        # unsigned number
 
 # Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
+indent_braces                   = false    # false/true
 
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
+# Disabled indenting function braces if indent_braces is True.
+indent_braces_no_func           = false    # false/true
 
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
+# Disabled indenting class braces if indent_braces is True.
+indent_braces_no_class          = false    # false/true
 
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
+# Disabled indenting struct braces if indent_braces is True.
+indent_braces_no_struct         = false    # false/true
 
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' → 3 spaces, 'for' → 4 spaces, etc.
-indent_brace_parent             = false    # true/false
+# Indent based on the size of the brace parent, i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
+indent_brace_parent             = false    # false/true
 
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
+# Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace.
+indent_paren_open_brace         = false    # false/true
 
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
+# indent a C# delegate by another level, default is to not indent by another level.
+indent_cs_delegate_brace        = false    # false/true
 
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
+# indent a C# delegate(To hanndle delegates with no brace) by another level. default: false
+indent_cs_delegate_body         = false    # false/true
 
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = false    # true/false
+# Whether the 'namespace' body is indented.
+indent_namespace                = false    # false/true
 
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
+# Only indent one namespace and no sub-namespaces.
+# Requires indent_namespace=True.
+indent_namespace_single_indent  = false    # false/true
 
 # The number of spaces to indent a namespace block.
 indent_namespace_level          = 0        # unsigned number
 
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
+# If the body of the namespace is longer than this number, it won't be indented.
+# Requires indent_namespace=True. Default=0 (no limit)
 indent_namespace_limit          = 0        # unsigned number
 
 # Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
+indent_extern                   = false    # false/true
 
 # Whether the 'class' body is indented.
-indent_class                    = false    # true/false
+indent_class                    = false    # false/true
 
 # Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
+indent_class_colon              = false    # false/true
 
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
+# Indent based on a class colon instead of the stuff after the colon.
+# Requires indent_class_colon=True. Default=False.
+indent_class_on_colon           = false    # false/true
 
 # Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
+indent_constr_colon             = false    # false/true
 
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
+# Virtual indent from the ':' for member initializers. Default=2.
 indent_ctor_init_leading        = 2        # unsigned number
 
 # Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
+# Negative values decrease indent down to the first column. Default=0.
 indent_ctor_init                = 0        # number
 
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
+# False=treat 'else\nif' as 'else if' for indenting purposes
+# True=indent the 'if' one level.
+indent_else_if                  = false    # false/true
 
-# Amount to indent variable declarations after a open brace.
-#
-# <0: Relative
-# ≥0: Absolute
+# Amount to indent variable declarations after a open brace. neg=relative, pos=absolute.
 indent_var_def_blk              = 0        # number
 
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
+# Indent continued variable declarations instead of aligning.
+indent_var_def_cont             = false    # false/true
 
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
+# Indent continued shift expressions ('<<' and '>>') instead of aligning.
+# Turn align_left_shift off when enabling this.
+indent_shift                    = false    # false/true
+
+# True:  force indentation of function definition to start in column 1
+# False: use the default behavior.
+indent_func_def_force_col1      = false    # false/true
+
+# True:  indent continued function call parameters one indent level
+# False: align parameters under the open paren.
+indent_func_call_param          = false    # false/true
 
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
+# Same as indent_func_call_param, but for function defs.
+indent_func_def_param           = false    # false/true
 
-# Same as indent_func_call_param, but for function definitions.
-indent_func_def_param           = false    # true/false
-
-# Same as indent_func_call_param, but for function prototypes.
-indent_func_proto_param         = false    # true/false
+# Same as indent_func_call_param, but for function protos.
+indent_func_proto_param         = false    # false/true
 
 # Same as indent_func_call_param, but for class declarations.
-indent_func_class_param         = false    # true/false
+indent_func_class_param         = false    # false/true
 
 # Same as indent_func_call_param, but for class variable constructors.
-indent_func_ctor_var_param      = false    # true/false
+indent_func_ctor_var_param      = false    # false/true
 
-# Same as indent_func_call_param, but for template parameter lists.
-indent_template_param           = false    # true/false
+# Same as indent_func_call_param, but for templates.
+indent_template_param           = false    # false/true
 
 # Double the indent for indent_func_xxx_param options.
 # Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
+indent_func_param_double        = false    # false/true
 
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
+# Indentation column for standalone 'const' function decl/proto qualifier.
 indent_func_const               = 0        # unsigned number
 
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
+# Indentation column for standalone 'throw' function decl/proto qualifier.
 indent_func_throw               = 0        # unsigned number
 
-# The number of spaces to indent a continued '->' or '.'.
+# The number of spaces to indent a continued '->' or '.'
 # Usually set to 0, 1, or indent_columns.
 indent_member                   = 0        # unsigned number
 
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
+# setting to true will indent lines broken at '.' or '->' by a single indent
+# UO_indent_member option will not be effective if this is set to true.
+indent_member_single            = false    # false/true
 
 # Spaces to indent single line ('//') comments on lines before code.
 indent_sing_line_comments       = 0        # unsigned number
 
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
+# If set, will indent trailing single line ('//') comments relative
+# to the code instead of trying to keep the same absolute column.
+indent_relative_single_line_comments = false    # false/true
 
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# Spaces to indent 'case' from 'switch'
+# Usually 0 or indent_columns.
 indent_switch_case              = 0        # unsigned number
 
 # Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
+indent_switch_pp                = true     # false/true
 
-# Spaces to shift the 'case' line, without affecting any other lines.
+# Spaces to shift the 'case' line, without affecting any other lines
 # Usually 0.
 indent_case_shift               = 0        # unsigned number
 
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
+# Spaces to indent '{' from 'case'.
+# By default, the brace will appear under the 'c' in case.
+# Usually set to 0 or indent_columns.
+# negative value are OK.
 indent_case_brace               = 0        # number
 
 # Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
+indent_col1_comment             = false    # false/true
 
-# How to indent goto labels.
-#
-# >0: Absolute column where 1 is the leftmost column
-# ≤0: Subtract from brace indent
-#
-# Default: 1
+# How to indent goto labels
+#   >0: absolute column where 1 is the leftmost column
+#  <=0: subtract from brace indent
+# Default=1
 indent_label                    = 1        # number
 
-# Same as indent_label, but for access specifiers that are followed by a
-# colon.
-#
-# Default: 1
+# Same as indent_label, but for access specifiers that are followed by a colon. Default=1
 indent_access_spec              = 1        # number
 
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
+# Indent the code after an access specifier by one level.
+# If set, this option forces 'indent_access_spec=0'.
+indent_access_spec_body         = false    # false/true
+
+# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended).
+indent_paren_nl                 = false    # false/true
+
+# Controls the indent of a close paren after a newline.
+# 0: Indent to body level
+# 1: Align under the open paren
 # 2: Indent to the brace level
 indent_paren_close              = 0        # unsigned number
 
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
+# Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren
+indent_paren_after_func_def     = false    # false/true
 
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
+# Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren
+indent_paren_after_func_decl    = false    # false/true
 
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
+# Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren
+indent_paren_after_func_call    = false    # false/true
 
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
+# Controls the indent of a comma when inside a paren.If True, aligns under the open paren.
+indent_comma_paren              = false    # false/true
 
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
+# Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren.
+indent_bool_paren               = false    # false/true
 
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
+# Controls the indent of a semicolon when inside a for paren.If True, aligns under the open for paren.
+indent_semicolon_for_paren      = false    # false/true
 
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
+# If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.
+indent_first_bool_expr          = false    # false/true
 
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
+# If 'indent_semicolon_for_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.
+indent_first_for_expr           = false    # false/true
 
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
+# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended).
+indent_square_nl                = false    # false/true
 
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
+# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies.
+indent_preserve_sql             = false    # false/true
 
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
+# Align continued statements at the '='. Default=True
+# If False or the '=' is followed by a newline, the next line is indent one tab.
+indent_align_assign             = true     # false/true
 
-# Whether to align continued statements at the '('. If false or the '(' is not
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
+# Align continued statements at the '('. Default=True
+# If FALSE or the '(' is not followed by a newline, the next line indent is one tab.
+indent_align_paren              = true     # false/true
 
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
+# Indent OC blocks at brace level instead of usual rules.
+indent_oc_block                 = false    # false/true
 
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
+# Indent OC blocks in a message relative to the parameter name.
+# 0=use indent_oc_block rules, 1+=spaces to indent
 indent_oc_block_msg             = 0        # unsigned number
 
-# (OC) Minimum indent for subsequent parameters
+# Minimum indent for subsequent parameters
 indent_oc_msg_colon             = 0        # unsigned number
 
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
+# If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).
+# Default=True.
+indent_oc_msg_prioritize_first_colon = true     # false/true
+
+# If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level).
+indent_oc_block_msg_xcode_style = false    # false/true
 
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword.
+indent_oc_block_msg_from_keyword = false    # false/true
 
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon.
+indent_oc_block_msg_from_colon  = false    # false/true
+
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is.
+indent_oc_block_msg_from_caret  = false    # false/true
+
+# If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is.
+indent_oc_block_msg_from_brace  = false    # false/true
+
+# When indenting after virtual brace open and newline add further spaces to reach this min. indent.
 indent_min_vbrace_open          = 0        # unsigned number
 
-# Whether to add further spaces after regular indent to reach next tabstop
-# when identing after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
+# True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop.
+indent_vbrace_open_on_tabstop   = false    # false/true
 
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
+# If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True.
+indent_token_after_brace        = true     # false/true
 
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
+# If True, cpp lambda body will be indentedDefault=False.
+indent_cpp_lambda_body          = false    # false/true
 
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
+# indent (or not) an using block if no braces are used. Only for C#.Default=True.
+indent_using_block              = true     # false/true
 
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
+# indent the continuation of ternary operator.
+# 0: (Default) off
 # 1: When the `if_false` is a continuation, indent it under `if_false`
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
 # If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
+indent_off_after_return_new     = false    # false/true
 
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
+# If true, the tokens after return are indented with regular single indentation.By default (false) the indentation is after the return token.
+indent_single_after_return      = false    # false/true
 
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
+# If true, ignore indent and align for asm blocks as they have their own indentation.
+indent_ignore_asm_block         = false    # false/true
 
 #
 # Newline adding and removing options
 #
 
 # Whether to collapse empty blocks between '{' and '}'.
-nl_collapse_empty_body          = false    # true/false
+nl_collapse_empty_body          = false    # false/true
 
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
+# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'.
+nl_assign_leave_one_liners      = false    # false/true
 
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
+# Don't split one-line braced statements inside a class xx { } body.
+nl_class_leave_one_liners       = false    # false/true
 
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
+# Don't split one-line enums: 'enum foo { BAR = 15 };'
+nl_enum_leave_one_liners        = false    # false/true
 
 # Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
+nl_getset_leave_one_liners      = false    # false/true
 
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-nl_func_leave_one_liners        = false    # true/false
+# Don't split one-line get or set functions.
+nl_cs_property_leave_one_liners = false    # false/true
 
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
+# Don't split one-line function definitions - 'int foo() { return 0; }'.
+nl_func_leave_one_liners        = false    # false/true
 
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
+# Don't split one-line C++11 lambdas - '[]() { return 0; }'.
+nl_cpp_lambda_leave_one_liners  = false    # false/true
 
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
+# Don't split one-line if/else statements - 'if(a) b++;'.
+nl_if_leave_one_liners          = false    # false/true
 
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
+# Don't split one-line while statements - 'while(a) b++;'.
+nl_while_leave_one_liners       = false    # false/true
 
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
+# Don't split one-line for statements - 'for(...) b++;'.
+nl_for_leave_one_liners         = false    # false/true
 
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+# Don't split one-line OC messages.
+nl_oc_msg_leave_one_liner       = false    # false/true
 
-# (OC) Add or remove newline between Objective-C block signature and '{'.
+# Add or remove newline between Objective-C block signature and '{'.
 nl_oc_block_brace               = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline between '@interface' and '{'.
+# Add or remove newline between @interface and '{'.
 nl_oc_interface_brace           = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline between '@implementation' and '{'.
+# Add or remove newline between @implementation and '{'.
 nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
 
 # Add or remove newlines at the start of the file.
 nl_start_of_file                = ignore   # ignore/add/remove/force
 
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
+# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'.
 nl_start_of_file_min            = 0        # unsigned number
 
 # Add or remove newline at the end of the file.
 nl_end_of_file                  = ignore   # ignore/add/remove/force
 
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
+# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force').
 nl_end_of_file_min              = 0        # unsigned number
 
 # Add or remove newline between '=' and '{'.
 nl_assign_brace                 = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between '=' and '['.
+# Add or remove newline between '=' and '[' (D only).
 nl_assign_square                = ignore   # ignore/add/remove/force
 
 # Add or remove newline between '[]' and '{'.
 nl_tsquare_brace                = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
+# Add or remove newline after '= [' (D only). Will also affect the newline before the ']'.
 nl_after_square_assign          = ignore   # ignore/add/remove/force
 
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
+# The number of blank lines after a block of variable definitions at the top of a function body
 # 0 = No change (default).
 nl_func_var_def_blk             = 0        # unsigned number
 
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0 = No change (default).
+# The number of newlines before a block of typedefs
+# 0 = No change (default)
+# is overridden by the option 'nl_after_access_spec'.
 nl_typedef_blk_start            = 0        # unsigned number
 
-# The number of newlines after a block of typedefs.
-#
+# The number of newlines after a block of typedefs
 # 0 = No change (default).
 nl_typedef_blk_end              = 0        # unsigned number
 
-# The maximum number of consecutive newlines within a block of typedefs.
-#
+# The maximum consecutive newlines within a block of typedefs
 # 0 = No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0 = No change (default).
+# The number of newlines before a block of variable definitions not at the top of a function body
+# 0 = No change (default)
+# is overridden by the option 'nl_after_access_spec'.
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
+# The number of newlines after a block of variable definitions not at the top of a function body
 # 0 = No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
 
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
+# The maximum consecutive newlines within a block of variable definitions
 # 0 = No change (default).
 nl_var_def_blk_in               = 0        # unsigned number
 
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
+# Add or remove newline between a function call's ')' and '{', as in:
+# list_for_each(item, &list) { }.
 nl_fcall_brace                  = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'enum' and '{'.
@@ -1345,7 +1106,7 @@
 # Add or remove newline between 'enum class' type and ':'.
 nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'enum class identifier :' and type.
+# Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'.
 nl_enum_colon_type              = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'struct and '{'.
@@ -1360,8 +1121,8 @@
 # Add or remove newline between '}' and 'else'.
 nl_brace_else                   = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
+# Add or remove newline between 'else if' and '{'
+# If set to ignore, nl_if_brace is used instead.
 nl_elseif_brace                 = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'else' and '{'.
@@ -1388,19 +1149,18 @@
 # Add or remove newline between 'for' and '{'.
 nl_for_brace                    = ignore   # ignore/add/remove/force
 
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
+# Add or remove newline between 'catch' and '{'.
 nl_catch_brace                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
+# Add or remove newline between '@catch' and '{'.
+# If set to ignore, nl_catch_brace is used.
 nl_oc_catch_brace               = ignore   # ignore/add/remove/force
 
 # Add or remove newline between '}' and 'catch'.
 nl_brace_catch                  = ignore   # ignore/add/remove/force
 
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
+# Add or remove newline between '}' and 'catch'.
+# If set to ignore, nl_brace_catch is used.
 nl_oc_brace_catch               = ignore   # ignore/add/remove/force
 
 # Add or remove newline between '}' and ']'.
@@ -1412,20 +1172,20 @@
 # Add or remove newline between 'while' and '{'.
 nl_while_brace                  = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between 'scope (x)' and '{'.
+# Add or remove newline between 'scope (x)' and '{' (D).
 nl_scope_brace                  = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between 'unittest' and '{'.
+# Add or remove newline between 'unittest' and '{' (D).
 nl_unittest_brace               = ignore   # ignore/add/remove/force
 
-# (D) Add or remove newline between 'version (x)' and '{'.
+# Add or remove newline between 'version (x)' and '{' (D).
 nl_version_brace                = ignore   # ignore/add/remove/force
 
-# (C#) Add or remove newline between 'using' and '{'.
+# Add or remove newline between 'using' and '{'.
 nl_using_brace                  = ignore   # ignore/add/remove/force
 
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
+# Add or remove newline between two open or close braces.
+# Due to general newline/brace handling, REMOVE may not work.
 nl_brace_brace                  = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'do' and '{'.
@@ -1440,32 +1200,26 @@
 # Add or remove newline between 'synchronized' and '{'.
 nl_synchronized_brace           = ignore   # ignore/add/remove/force
 
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
+# Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.
+# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace.
+nl_multi_line_cond              = false    # false/true
 
 # Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
+nl_multi_line_define            = false    # false/true
 
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force
+# Whether to put a newline before 'case' statement, not after the first 'case'.
+nl_before_case                  = false    # false/true
 
 # Add or remove newline between ')' and 'throw'.
 nl_before_throw                 = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'namespace' and '{'.
+# Whether to put a newline after 'case' statement.
+nl_after_case                   = false    # false/true
+
+# Add or remove a newline between a case ':' and '{'. Overrides nl_after_case.
+nl_case_colon_brace             = ignore   # ignore/add/remove/force
+
+# Newline between namespace and {.
 nl_namespace_brace              = ignore   # ignore/add/remove/force
 
 # Add or remove newline between 'template<>' and whatever follows.
@@ -1474,56 +1228,48 @@
 # Add or remove newline between 'class' and '{'.
 nl_class_brace                  = ignore   # ignore/add/remove/force
 
-# Add or remove newline before or after (depending on pos_class_comma) each
-# ',' in the base class list.
+# Add or remove newline before/after each ',' in the base class list,
+#   (tied to pos_class_comma).
 nl_class_init_args              = ignore   # ignore/add/remove/force
 
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
+# Add or remove newline after each ',' in the constructor member initialization.
+# Related to nl_constr_colon, pos_constr_colon and pos_constr_comma.
 nl_constr_init_args             = ignore   # ignore/add/remove/force
 
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
+# Add or remove newline before first element, after comma, and after last element in enum.
 nl_enum_own_lines               = ignore   # ignore/add/remove/force
 
-# Add or remove newline between return type and function name in a function
-# definition.
+# Add or remove newline between return type and function name in a function definition.
 nl_func_type_name               = ignore   # ignore/add/remove/force
 
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
+# Add or remove newline between return type and function name inside a class {}
+# Uses nl_func_type_name or nl_func_proto_type_name if set to ignore.
 nl_func_type_name_class         = ignore   # ignore/add/remove/force
 
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
+# Add or remove newline between class specification and '::' in 'void A::f() { }'
+# Only appears in separate member implementation (does not appear with in-line implmementation).
 nl_func_class_scope             = ignore   # ignore/add/remove/force
 
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
+# Add or remove newline between function scope and name
+# Controls the newline after '::' in 'void A::f() { }'.
 nl_func_scope_name              = ignore   # ignore/add/remove/force
 
 # Add or remove newline between return type and function name in a prototype.
 nl_func_proto_type_name         = ignore   # ignore/add/remove/force
 
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
+# Add or remove newline between a function name and the opening '(' in the declaration.
 nl_func_paren                   = ignore   # ignore/add/remove/force
 
 # Overrides nl_func_paren for functions with no parameters.
 nl_func_paren_empty             = ignore   # ignore/add/remove/force
 
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
+# Add or remove newline between a function name and the opening '(' in the definition.
 nl_func_def_paren               = ignore   # ignore/add/remove/force
 
 # Overrides nl_func_def_paren for functions with no parameters.
 nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
 
-# Add or remove newline between a function name and the opening '(' in the
-# call.
+# Add or remove newline between a function name and the opening '(' in the call
 nl_func_call_paren              = ignore   # ignore/add/remove/force
 
 # Overrides nl_func_call_paren for functions with no parameters.
@@ -1541,13 +1287,11 @@
 # Overrides nl_func_def_start when there is only one parameter.
 nl_func_def_start_single        = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
+# Whether to add newline after '(' in a function declaration if '(' and ')' are in different lines.
+nl_func_decl_start_multi_line   = false    # false/true
+
+# Whether to add newline after '(' in a function definition if '(' and ')' are in different lines.
+nl_func_def_start_multi_line    = false    # false/true
 
 # Add or remove newline after each ',' in a function declaration.
 nl_func_decl_args               = ignore   # ignore/add/remove/force
@@ -1555,13 +1299,11 @@
 # Add or remove newline after each ',' in a function definition.
 nl_func_def_args                = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
+# Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines.
+nl_func_decl_args_multi_line    = false    # false/true
+
+# Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines.
+nl_func_def_args_multi_line     = false    # false/true
 
 # Add or remove newline before the ')' in a function declaration.
 nl_func_decl_end                = ignore   # ignore/add/remove/force
@@ -1575,13 +1317,11 @@
 # Overrides nl_func_def_end when there is only one parameter.
 nl_func_def_end_single          = ignore   # ignore/add/remove/force
 
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
+# Whether to add newline before ')' in a function declaration if '(' and ')' are in different lines.
+nl_func_decl_end_multi_line     = false    # false/true
+
+# Whether to add newline before ')' in a function definition if '(' and ')' are in different lines.
+nl_func_def_end_multi_line      = false    # false/true
 
 # Add or remove newline between '()' in a function declaration.
 nl_func_decl_empty              = ignore   # ignore/add/remove/force
@@ -1592,21 +1332,18 @@
 # Add or remove newline between '()' in a function call.
 nl_func_call_empty              = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
+# Whether to add newline after '(' in a function call if '(' and ')' are in different lines.
+nl_func_call_start_multi_line   = false    # false/true
+
+# Whether to add newline after each ',' in a function call if '(' and ')' are in different lines.
+nl_func_call_args_multi_line    = false    # false/true
 
-# (OC) Whether to put each Objective-C message parameter on a separate line.
+# Whether to add newline before ')' in a function call if '(' and ')' are in different lines.
+nl_func_call_end_multi_line     = false    # false/true
+
+# Whether to put each OC message parameter on a separate line
 # See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
+nl_oc_msg_args                  = false    # false/true
 
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = ignore   # ignore/add/remove/force
@@ -1614,77 +1351,70 @@
 # Add or remove newline between C++11 lambda signature and '{'.
 nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
 
-# Add or remove newline between 'return' and the return expression.
+# Add or remove a newline between the return keyword and return expression.
 nl_return_expr                  = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
+# Whether to put a newline after semicolons, except in 'for' statements.
+nl_after_semicolon              = false    # false/true
 
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
+# Java: Control the newline between the ')' and '{{' of the double brace initializer.
 nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
+# Whether to put a newline after the type in an unnamed temporary direct-list-initialization.
 nl_type_brace_init_lst          = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
+# Whether to put a newline after open brace in an unnamed temporary direct-list-initialization.
 nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force
 
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
+# Whether to put a newline before close brace in an unnamed temporary direct-list-initialization.
 nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force
 
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
+# Whether to put a newline after brace open.
+# This also adds a newline before the matching brace close.
+nl_after_brace_open             = false    # false/true
+
+# If nl_after_brace_open and nl_after_brace_open_cmt are True, a newline is
+# placed between the open brace and a trailing single-line comment.
+nl_after_brace_open_cmt         = false    # false/true
 
-# Whether to add a newline after a virtual brace open with a non-empty body.
+# Whether to put a newline after a virtual brace open with a non-empty body.
 # These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
+nl_after_vbrace_open            = false    # false/true
 
-# Whether to add a newline after a virtual brace open with an empty body.
+# Whether to put a newline after a virtual brace open with an empty body.
 # These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
+nl_after_vbrace_open_empty      = false    # false/true
+
+# Whether to put a newline after a brace close.
+# Does not apply if followed by a necessary ';'.
+nl_after_brace_close            = false    # false/true
+
+# Whether to put a newline after a virtual brace close.
+# Would add a newline before return in: 'if (foo) a++; return;'.
+nl_after_vbrace_close           = false    # false/true
 
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
+# Control the newline between the close brace and 'b' in: 'struct { int a; } b;'
+# Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close.
 nl_brace_struct_var             = ignore   # ignore/add/remove/force
 
 # Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
+nl_define_macro                 = false    # false/true
 
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
+# Whether to alter newlines between consecutive paren closes, 
+# The number of closing paren in a line will depend on respective open paren lines
+nl_squeeze_paren_close          = false    # false/true
+
+# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs.
+nl_squeeze_ifdef                = false    # false/true
 
 # Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
+nl_squeeze_ifdef_top_level      = false    # false/true
 
 # Add or remove blank line before 'if'.
 nl_before_if                    = ignore   # ignore/add/remove/force
 
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
+# Add or remove blank line after 'if' statement.
+# Add/Force work only if the next token is not a closing brace.
 nl_after_if                     = ignore   # ignore/add/remove/force
 
 # Add or remove blank line before 'for'.
@@ -1717,111 +1447,92 @@
 # Add or remove blank line after 'do/while' statement.
 nl_after_do                     = ignore   # ignore/add/remove/force
 
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
+# Whether to double-space commented-entries in struct/union/enum.
+nl_ds_struct_enum_cmt           = false    # false/true
+
+# force nl before } of a struct/union/enum
+# (lower priority than 'eat_blanks_before_close_brace').
+nl_ds_struct_enum_close_brace   = false    # false/true
 
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
+# Add or remove blank line before 'func_class_def'.
+nl_before_func_class_def        = 0        # unsigned number
 
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
+# Add or remove blank line before 'func_class_proto'.
+nl_before_func_class_proto      = 0        # unsigned number
+
+# Add or remove a newline before/after a class colon,
+#   (tied to pos_class_colon).
 nl_class_colon                  = ignore   # ignore/add/remove/force
 
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
+# Add or remove a newline around a class constructor colon.
+# Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma.
 nl_constr_colon                 = ignore   # ignore/add/remove/force
 
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' → 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' → 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' → 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
+# If true turns two liner namespace to one liner,else will make then four liners
+nl_namespace_two_to_one_liner   = false    # false/true
+
+# Change simple unbraced if statements into a one-liner
+# 'if(b)\n i++;' => 'if(b) i++;'.
+nl_create_if_one_liner          = false    # false/true
+
+# Change simple unbraced for statements into a one-liner
+# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'.
+nl_create_for_one_liner         = false    # false/true
+
+# Change simple unbraced while statements into a one-liner
+# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'.
+nl_create_while_one_liner       = false    # false/true
+
+# Change simple 4,3,2 liner function def statements into a one-liner
+nl_create_func_def_one_liner    = false    # false/true
+
+#  Change a one-liner if statement into simple unbraced if
+# 'if(b) i++;' => 'if(b)\n i++;'.
+nl_split_if_one_liner           = false    # false/true
+
+# Change a one-liner for statement into simple unbraced for
+# 'for (i=0;<5;i++) foo(i);' => 'for (i=0;<5;i++)\n foo(i);'.
+nl_split_for_one_liner          = false    # false/true
+
+# Change a one-liner while statement into simple unbraced while
+# 'while (i<5) foo(i++);' => 'while (i<5)\n foo(i++);'.
+nl_split_while_one_liner        = false    # false/true
 
 #
 # Blank line options
 #
 
-# The maximum number of consecutive newlines (3 = 2 blank lines).
+# The maximum consecutive newlines (3 = 2 blank lines).
 nl_max                          = 0        # unsigned number
 
-# The maximum number of consecutive newlines in a function.
+# The maximum consecutive newlines in function.
 nl_max_blank_in_func            = 0        # unsigned number
 
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition.
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
+# The number of newlines after a function prototype, if followed by another function prototype.
 nl_after_func_proto             = 0        # unsigned number
 
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
+# The number of newlines after a function prototype, if not followed by another function prototype.
 nl_after_func_proto_group       = 0        # unsigned number
 
-# The number of newlines after a class constructor/destructor prototype.
+# The number of newlines after a function class prototype, if followed by another function class prototype.
 nl_after_func_class_proto       = 0        # unsigned number
 
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
+# The number of newlines after a function class prototype, if not followed by another function class prototype.
 nl_after_func_class_proto_group = 0        # unsigned number
 
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
+# The number of newlines before a multi-line function def body.
+nl_before_func_body_def         = 0        # unsigned number
+
+# The number of newlines before a multi-line function prototype body.
+nl_before_func_body_proto       = 0        # unsigned number
 
 # The number of newlines after '}' of a multi-line function body.
 nl_after_func_body              = 0        # unsigned number
 
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
+# The number of newlines after '}' of a multi-line function body in a class declaration.
 nl_after_func_body_class        = 0        # unsigned number
 
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
+# The number of newlines after '}' of a single line function body.
 nl_after_func_body_one_liner    = 0        # unsigned number
 
 # The minimum number of newlines before a multi-line comment.
@@ -1837,10 +1548,10 @@
 nl_before_cpp_comment           = 0        # unsigned number
 
 # Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
+nl_after_multiline_comment      = false    # false/true
 
 # Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
+nl_after_label_colon            = false    # false/true
 
 # The number of newlines after '}' or ';' of a struct/enum/union definition.
 nl_after_struct                 = 0        # unsigned number
@@ -1851,83 +1562,58 @@
 # The number of newlines after '}' or ';' of a class definition.
 nl_after_class                  = 0        # unsigned number
 
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0 = No change (default).
+# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
+# Will not change the newline count if after a brace open.
+# 0 = No change.
 nl_before_access_spec           = 0        # unsigned number
 
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0 = No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
+# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.
+# 0 = No change.
+# Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'.
 nl_after_access_spec            = 0        # unsigned number
 
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0 = No change (default).
+# The number of newlines between a function def and the function comment.
+# 0 = No change.
 nl_comment_func_def             = 0        # unsigned number
 
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0 = No change (default).
+# The number of newlines after a try-catch-finally block that isn't followed by a brace close.
+# 0 = No change.
 nl_after_try_catch_finally      = 0        # unsigned number
 
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0 = No change (default).
+# The number of newlines before and after a property, indexer or event decl.
+# 0 = No change.
 nl_around_cs_property           = 0        # unsigned number
 
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0 = No change (default).
+# The number of newlines between the get/set/add/remove handlers in C#.
+# 0 = No change.
 nl_between_get_set              = 0        # unsigned number
 
-# (C#) Add or remove newline between property and the '{'.
+# Add or remove newline between C# property and the '{'.
 nl_property_brace               = ignore   # ignore/add/remove/force
 
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0 = Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
 # Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
+eat_blanks_after_open_brace     = false    # false/true
 
 # Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
+eat_blanks_before_close_brace   = false    # false/true
 
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
+# How aggressively to remove extra newlines not in preproc.
+# 0: No change
 # 1: Remove most newlines not handled by other config
 # 2: Remove all newlines and reformat completely by config
 nl_remove_extra_newlines        = 0        # unsigned number
 
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
+# Whether to put a blank line before 'return' statements, unless after an open brace.
+nl_before_return                = false    # false/true
+
+# Whether to put a blank line after 'return' statements, unless followed by a close brace.
+nl_after_return                 = false    # false/true
 
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
+# Whether to put a newline after a Java annotation statement.
+# Only affects annotations that are after a newline.
 nl_after_annotation             = ignore   # ignore/add/remove/force
 
-# (Java) Add or remove newline between two annotations.
+# Controls the newline between two annotations.
 nl_between_annotation           = ignore   # ignore/add/remove/force
 
 #
@@ -1935,486 +1621,382 @@
 #
 
 # The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_arith                       = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of assignment in wrapped expressions.
+# Do not affect '=' followed by '{'.
+pos_assign                      = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of boolean operators in wrapped expressions.
+pos_bool                        = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_compare                     = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of conditional (b ? t : f) operators in wrapped expressions.
+pos_conditional                 = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_comma                       = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_enum_comma                  = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of the comma in the base class list if there are more than one line,
+#   (tied to nl_class_init_args).
+pos_class_comma                 = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 # The position of the comma in the constructor initialization list.
 # Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_comma                = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+# The position of trailing/leading class colon, between class and base class list
+#   (tied to nl_class_colon).
+pos_class_colon                 = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of colons between constructor and member initialization.
+# The position of colons between constructor and member initialization,
+# (tied to nl_constr_colon).
 # Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_colon                = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
 #
-# Line splitting options
+# Line Splitting options
 #
 
-# Try to limit code width to N columns.
+# Try to limit code width to N number of columns
 code_width                      = 0        # unsigned number
 
 # Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
+ls_for_split_full               = false    # false/true
 
-# Whether to fully split long function prototypes/calls at commas.
-ls_func_split_full              = false    # true/false
+# Whether to fully split long function protos/calls at commas.
+ls_func_split_full              = false    # false/true
 
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-ls_code_width                   = false    # true/false
+# Whether to split lines as close to code_width as possible and ignore some groupings.
+ls_code_width                   = false    # false/true
 
 #
-# Code alignment options (not left column spaces/tabs)
+# Code alignment (not left column spaces/tabs)
 #
 
 # Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
+align_keep_tabs                 = false    # false/true
 
 # Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
+align_with_tabs                 = false    # false/true
 
 # Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
+align_on_tabstop                = false    # false/true
 
 # Whether to right-align numbers.
-align_number_right              = false    # true/false
+align_number_right              = false    # false/true
 
 # Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
+align_keep_extra_space          = false    # false/true
 
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
+# Align variable definitions in prototypes and functions.
+align_func_params               = false    # false/true
 
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0 = Don't align (default).
+# The span for aligning parameter definitions in function on parameter name (0=don't align).
 align_func_params_span          = 0        # unsigned number
 
-# The threshold for aligning function parameter definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning function parameter definitions (0=no limit).
 align_func_params_thresh        = 0        # unsigned number
 
 # The gap for aligning function parameter definitions.
 align_func_params_gap           = 0        # unsigned number
 
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
+# Align parameters in single-line functions that have the same name.
+# The function names must already be aligned with each other.
+align_same_func_call_params     = false    # false/true
 
-# The span for aligning function-call parameters for single line functions.
-#
-# 0 = Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
+# The span for aligning parameters in single line functions with the same name (0=don't align).
+align_same_func_call_params_span = 0       # unsigned number
 
-# The threshold for aligning function-call parameters for single line
-# functions.
-#
-# 0 = No limit (default).
-align_same_func_call_params_thresh = 0        # unsigned number
+# The thresh for aligning function call parameters (0=no limit).
+align_same_func_call_params_thresh = 0     # unsigned number
 
-# The span for aligning variable definitions.
-#
-# 0 = Don't align (default).
+# The span for aligning variable definitions (0=don't align)
 align_var_def_span              = 0        # unsigned number
 
-# How to align the '*' in variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
+# How to align the star in variable definitions.
+#  0=Part of the type     'void *   foo;'
+#  1=Part of the variable 'void     *foo;'
+#  2=Dangling             'void    *foo;'
 align_var_def_star_style        = 0        # unsigned number
 
 # How to align the '&' in variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
+#  0=Part of the type
+#  1=Part of the variable
+#  2=Dangling
 align_var_def_amp_style         = 0        # unsigned number
 
-# The threshold for aligning variable definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning variable definitions (0=no limit)
 align_var_def_thresh            = 0        # unsigned number
 
 # The gap for aligning variable definitions.
 align_var_def_gap               = 0        # unsigned number
 
 # Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
+align_var_def_colon             = false    # false/true
 
-# The gap for aligning the colon in struct bit fields.
+# align variable defs gap for bit colons.
 align_var_def_colon_gap         = 0        # unsigned number
 
 # Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
+align_var_def_attribute         = false    # false/true
 
 # Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
+align_var_def_inline            = false    # false/true
 
-# The span for aligning on '=' in assignments.
-#
-# 0 = Don't align (default).
+# The span for aligning on '=' in assignments (0=don't align)
 align_assign_span               = 0        # unsigned number
 
-# The threshold for aligning on '=' in assignments.
-#
-# 0 = No limit (default).
+# The threshold for aligning on '=' in assignments (0=no limit)
 align_assign_thresh             = 0        # unsigned number
 
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0 = Don't align (default).
+# The span for aligning on '=' in enums (0=don't align)
 align_enum_equ_span             = 0        # unsigned number
 
-# The threshold for aligning on '=' in enums.
-#
-# 0 = no limit (default).
+# The threshold for aligning on '=' in enums (0=no limit)
 align_enum_equ_thresh           = 0        # unsigned number
 
-# The span for aligning class member definitions.
-#
-# 0 = Don't align (default).
+# The span for aligning class (0=don't align)
 align_var_class_span            = 0        # unsigned number
 
-# The threshold for aligning class member definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning class member definitions (0=no limit).
 align_var_class_thresh          = 0        # unsigned number
 
 # The gap for aligning class member definitions.
 align_var_class_gap             = 0        # unsigned number
 
-# The span for aligning struct/union member definitions.
-#
-# 0 = Don't align (default).
+# The span for aligning struct/union (0=don't align)
 align_var_struct_span           = 0        # unsigned number
 
-# The threshold for aligning struct/union member definitions.
-#
-# 0 = No limit (default).
+# The threshold for aligning struct/union member definitions (0=no limit)
 align_var_struct_thresh         = 0        # unsigned number
 
 # The gap for aligning struct/union member definitions.
 align_var_struct_gap            = 0        # unsigned number
 
-# The span for aligning struct initializer values.
-#
-# 0 = Don't align (default).
+# The span for aligning struct initializer values (0=don't align)
 align_struct_init_span          = 0        # unsigned number
 
 # The minimum space between the type and the synonym of a typedef.
 align_typedef_gap               = 0        # unsigned number
 
-# The span for aligning single-line typedefs.
-#
-# 0 = Don't align (default).
+# The span for aligning single-line typedefs (0=don't align).
 align_typedef_span              = 0        # unsigned number
 
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
+# How to align typedef'd functions with other typedefs
+# 0: Don't mix them at all
+# 1: align the open paren with the types
+# 2: align the function type name with the other type names
 align_typedef_func              = 0        # unsigned number
 
-# How to align the '*' in typedefs.
-#
-# 0: Align on typedef type, ignore '*' (default)
-# 1: The '*' is part of type name: 'typedef int  *pint;'
-# 2: The '*' is part of the type, but dangling: 'typedef int *pint;'
+# Controls the positioning of the '*' in typedefs. Just try it.
+# 0: Align on typedef type, ignore '*'
+# 1: The '*' is part of type name: typedef int  *pint;
+# 2: The '*' is part of the type, but dangling: typedef int *pint;
 align_typedef_star_style        = 0        # unsigned number
 
-# How to align the '&' in typedefs.
-#
-# 0: Align on typedef type, ignore '&' (default)
-# 1: The '&' is part of type name: 'typedef int  &pint;'
-# 2: The '&' is part of the type, but dangling: 'typedef int &pint;'
+# Controls the positioning of the '&' in typedefs. Just try it.
+# 0: Align on typedef type, ignore '&'
+# 1: The '&' is part of type name: typedef int  &pint;
+# 2: The '&' is part of the type, but dangling: typedef int &pint;
 align_typedef_amp_style         = 0        # unsigned number
 
-# The span for aligning comments that end lines.
-#
-# 0 = Don't align (default).
+# The span for aligning comments that end lines (0=don't align)
 align_right_cmt_span            = 0        # unsigned number
 
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
+# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment.
+align_right_cmt_mix             = false    # false/true
+
+# If a trailing comment is more than this number of columns away from the text it follows,
+# it will qualify for being aligned. This has to be > 0 to do anything.
 align_right_cmt_gap             = 0        # unsigned number
 
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0 = Ignore (default).
+# Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore)
 align_right_cmt_at_col          = 0        # unsigned number
 
-# The span for aligning function prototypes.
-#
-# 0 = Don't align (default).
+# The span for aligning function prototypes (0=don't align).
 align_func_proto_span           = 0        # unsigned number
 
 # Minimum gap between the return type and the function name.
 align_func_proto_gap            = 0        # unsigned number
 
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
+# Align function protos on the 'operator' keyword instead of what follows.
+align_on_operator               = false    # false/true
+
+# Whether to mix aligning prototype and variable declarations.
+# If True, align_var_def_XXX options are used instead of align_func_proto_XXX options.
+align_mix_var_proto             = false    # false/true
+
+# Align single-line functions with function prototypes, uses align_func_proto_span.
+align_single_line_func          = false    # false/true
+
+# Aligning the open brace of single-line functions.
+# Requires align_single_line_func=True, uses align_func_proto_span.
+align_single_line_brace         = false    # false/true
 
 # Gap for align_single_line_brace.
 align_single_line_brace_gap     = 0        # unsigned number
 
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0 = Don't align (default).
+# The span for aligning ObjC msg spec (0=don't align)
 align_oc_msg_spec_span          = 0        # unsigned number
 
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
+# Whether to align macros wrapped with a backslash and a newline.
+# This will not work right if the macro contains a multi-line comment.
+align_nl_cont                   = false    # false/true
 
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
+# # Align macro functions and variables together.
+align_pp_define_together        = false    # false/true
 
 # The minimum space between label and value of a preprocessor define.
 align_pp_define_gap             = 0        # unsigned number
 
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
+# The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks)
 align_pp_define_span            = 0        # unsigned number
 
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
+# Align lines that start with '<<' with previous '<<'. Default=True.
+align_left_shift                = true     # false/true
 
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
+# Align text after asm volatile () colons.
+align_asm_colon                 = false    # false/true
 
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0 = Don't align.
+# Span for aligning parameters in an Obj-C message call on the ':' (0=don't align)
 align_oc_msg_colon_span         = 0        # unsigned number
 
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
+# If True, always align with the first parameter, even if it is too short.
+align_oc_msg_colon_first        = false    # false/true
 
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
+# Aligning parameters in an Obj-C '+' or '-' declaration on the ':'.
+align_oc_decl_colon             = false    # false/true
 
 #
-# Comment modification options
+# Comment modifications
 #
 
-# Try to wrap comments at N columns.
+# Try to wrap comments at cmt_width columns
 cmt_width                       = 0        # unsigned number
 
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow
+# Set the comment reflow mode (Default=0)
+# 0: no reflowing (apart from the line wrapping due to cmt_width)
+# 1: no touching at all
+# 2: full reflow
 cmt_reflow_mode                 = 0        # unsigned number
 
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = false    # true/false
+# Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting.
+cmt_convert_tab_to_spaces       = false    # false/true
 
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
+# If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars.
+# Default=True.
+cmt_indent_multi                = true     # false/true
 
 # Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
+cmt_c_group                     = false    # false/true
 
 # Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
+cmt_c_nl_start                  = false    # false/true
 
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
+# Whether to put a newline before the closing '*/' of the combined c-comment.
+cmt_c_nl_end                    = false    # false/true
 
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
+# Whether to group cpp-comments that look like they are in a block.
+cmt_cpp_group                   = false    # false/true
 
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
+# Whether to put an empty '/*' on the first line of the combined cpp-comment.
+cmt_cpp_nl_start                = false    # false/true
 
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
+# Whether to put a newline before the closing '*/' of the combined cpp-comment.
+cmt_cpp_nl_end                  = false    # false/true
 
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
+# Whether to change cpp-comments into c-comments.
+cmt_cpp_to_c                    = false    # false/true
 
 # Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
+cmt_star_cont                   = false    # false/true
 
 # The number of spaces to insert at the start of subsequent comment lines.
 cmt_sp_before_star_cont         = 0        # unsigned number
 
 # The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
+cmt_sp_after_star_cont          = 0        # number
 
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
+# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+# the comment are the same length. Default=True.
+cmt_multi_check_last            = true     # false/true
 
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
+# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+# the comment are the same length AND if the length is bigger as the first_len minimum. Default=4
 cmt_multi_first_len_minimum     = 4        # unsigned number
 
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
+# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.
+# Will substitute $(filename) with the current file's name.
 cmt_insert_file_header          = ""         # string
 
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
+# The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.
+# Will substitute $(filename) with the current file's name.
 cmt_insert_file_footer          = ""         # string
 
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
+# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.
+# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
+# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }.
 cmt_insert_func_header          = ""         # string
 
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
+# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.
+# Will substitute $(class) with the class name.
 cmt_insert_class_header         = ""         # string
 
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
+# The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment.
+# Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.
 cmt_insert_oc_msg_header        = ""         # string
 
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
+# If a preprocessor is encountered when stepping backwards from a function name, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header.
+cmt_insert_before_preproc       = false    # false/true
+
+# If a function is declared inline to a class definition, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_func_header.
+cmt_insert_before_inlines       = true     # false/true
+
+# If the function is a constructor/destructor, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_func_header.
+cmt_insert_before_ctor_dtor     = false    # false/true
 
 #
 # Code modifying options (non-whitespace)
 #
 
-# Add or remove braces on a single-line 'do' statement.
+# Add or remove braces on single-line 'do' statement.
 mod_full_brace_do               = ignore   # ignore/add/remove/force
 
-# Add or remove braces on a single-line 'for' statement.
+# Add or remove braces on single-line 'for' statement.
 mod_full_brace_for              = ignore   # ignore/add/remove/force
 
-# (Pawn) Add or remove braces on a single-line function definition.
+# Add or remove braces on single-line function definitions. (Pawn).
 mod_full_brace_function         = ignore   # ignore/add/remove/force
 
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
+# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
 mod_full_brace_if               = ignore   # ignore/add/remove/force
 
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
+# Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
+# If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
+mod_full_brace_if_chain         = false    # false/true
+
+# Make all if/elseif/else statements with at least one 'else' or 'else if' fully braced.
+# If mod_full_brace_if_chain is used together with this option, all if-else chains will get braces,
+# and simple 'if' statements will lose them (if possible).
+mod_full_brace_if_chain_only    = false    # false/true
+
+# Don't remove braces around statements that span N newlines
+mod_full_brace_nl               = 0        # unsigned number
+
+# Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines.
+mod_full_brace_nl_block_rem_mlcond = false    # false/true
 
 # Add or remove braces on single-line 'while' statement.
 mod_full_brace_while            = ignore   # ignore/add/remove/force
@@ -2422,192 +2004,142 @@
 # Add or remove braces on single-line 'using ()' statement.
 mod_full_brace_using            = ignore   # ignore/add/remove/force
 
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
+# Add or remove unnecessary paren on 'return' statement.
 mod_paren_on_return             = ignore   # ignore/add/remove/force
 
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
+# Whether to change optional semicolons to real semicolons.
+mod_pawn_semicolon              = false    # false/true
 
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' → 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
+# Add parens on 'while' and 'if' statement around bools.
+mod_full_paren_if_bool          = false    # false/true
 
 # Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
+mod_remove_extra_semicolon      = false    # false/true
 
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
+# If a function body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_function_closebrace_comment = 0        # unsigned number
 
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
+# If a namespace body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_namespace_closebrace_comment = 0        # unsigned number
 
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
+# If a class body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_class_closebrace_comment = 0        # unsigned number
 
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
+# If a switch body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
 mod_add_long_switch_closebrace_comment = 0        # unsigned number
 
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
+# If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after
+# the #endif, a comment will be added.
 mod_add_long_ifdef_endif_comment = 0        # unsigned number
 
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
+# If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after
+# the #else, a comment will be added.
 mod_add_long_ifdef_else_comment = 0        # unsigned number
 
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
+# If True, will sort consecutive single-line 'import' statements [Java, D].
+mod_sort_import                 = false    # false/true
+
+# If True, will sort consecutive single-line 'using' statements [C#].
+mod_sort_using                  = false    # false/true
 
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
+# If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]
+# This is generally a bad idea, as it may break your code.
+mod_sort_include                = false    # false/true
 
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' → 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
+# If True, it will move a 'break' that appears after a fully braced 'case' before the close brace.
+mod_move_case_break             = false    # false/true
 
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
+# Will add or remove the braces around a fully braced case statement.
+# Will only remove the braces if there are no variable declarations in the block.
 mod_case_brace                  = ignore   # ignore/add/remove/force
 
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
+# If True, it will remove a void 'return;' that appears as the last statement in a function.
+mod_remove_empty_return         = false    # false/true
 
-# (OC) Weight of a class property modifier.
+# If True, it will organize the properties (Obj-C).
+mod_sort_oc_properties          = false    # false/true
+
+# Determines weight of class property modifier (Obj-C).
 mod_sort_oc_property_class_weight = 0        # number
 
-# (OC) Weight of 'atomic' and 'nonatomic'.
+# Determines weight of atomic, nonatomic (Obj-C).
 mod_sort_oc_property_thread_safe_weight = 0        # number
 
-# (OC) Weight of 'readwrite' when organizing properties.
+# Determines weight of readwrite (Obj-C).
 mod_sort_oc_property_readwrite_weight = 0        # number
 
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
+# Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C).
 mod_sort_oc_property_reference_weight = 0        # number
 
-# (OC) Weight of getter type ('getter=') when organizing properties.
+# Determines weight of getter type (getter=) (Obj-C).
 mod_sort_oc_property_getter_weight = 0        # number
 
-# (OC) Weight of setter type ('setter=') when organizing properties.
+# Determines weight of setter type (setter=) (Obj-C).
 mod_sort_oc_property_setter_weight = 0        # number
 
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
+# Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C).
 mod_sort_oc_property_nullability_weight = 0        # number
 
 #
 # Preprocessor options
 #
 
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
+# Control indent of preprocessors inside #if blocks at brace level 0 (file-level).
 pp_indent                       = ignore   # ignore/add/remove/force
 
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
+# Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False).
+pp_indent_at_level              = false    # false/true
+
+# Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
+# If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
+# Default=1.
 pp_indent_count                 = 1        # unsigned number
 
 # Add or remove space after # based on pp_level of #if blocks.
 pp_space                        = ignore   # ignore/add/remove/force
 
-# Sets the number of spaces per level added with pp_space.
+# Sets the number of spaces added with pp_space.
 pp_space_count                  = 0        # unsigned number
 
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
+# The indent for #region and #endregion in C# and '#pragma region' in C/C++.
 pp_indent_region                = 0        # number
 
 # Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
+pp_region_indent_code           = false    # false/true
 
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
+# If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level.
+# 0:  indent preprocessors using output_tab_size.
+# >0: column at which all preprocessors will be indented.
 pp_indent_if                    = 0        # number
 
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
+# Control whether to indent the code between #if, #else and #endif.
+pp_if_indent_code               = false    # false/true
 
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
+# Whether to indent '#define' at the brace level (True) or from column 1 (false).
+pp_define_at_level              = false    # false/true
 
 # Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
+pp_ignore_define_body           = false    # false/true
 
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
+# Only applies to the indent of the preprocesser that the case statements directly inside of.
+pp_indent_case                  = true     # false/true
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
+# Only applies to the indent of the preprocesser that the function definition is directly inside of.
+pp_indent_func_def              = true     # false/true
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
+# Only applies to the indent of the preprocesser that the extern block is directly inside of.
+pp_indent_extern                = true     # false/true
 
 # Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
+# Only applies to the indent of the preprocesser that the braces are directly inside of.
+pp_indent_brace                 = true     # false/true
 
 #
 # Sort includes options
@@ -2626,58 +2158,38 @@
 # Use or Do not Use options
 #
 
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
+# True:  indent_func_call_param will be used (default)
+# False: indent_func_call_param will NOT be used.
+use_indent_func_call_param      = true     # false/true
+
+# The value of the indentation for a continuation line is calculate differently if the statement is:
+#   a declaration: your case with QString fileName ...
+#   an assignment: your case with pSettings = new QSettings( ...
 # At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
-indent_cpp_lambda_only_once     = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
+#   at the assignment
+#   at the function call (if present)
+# To prevent the double use of the indentation value, use this option with the value 'True'.
+# True:  indent_continue will be used only once
+# False: indent_continue will be used every time (default).
+use_indent_continue_only_once   = false    # false/true
+
+# the value might be used twice:
+#   at the assignment
+#   at the opening brace
+# To prevent the double use of the indentation value, use this option with the value 'True'.
+# True:  indentation will be used only once
+# False: indentation will be used every time (default).
+indent_cpp_lambda_only_once     = false    # false/true
+
+# SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details.
+# Default=True.
+use_options_overriding_for_qt_macros = true     # false/true
 
 #
 # Warn levels - 1: error, 2: warning (default), 3: note
 #
 
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
+# Warning is given if doing tab-to-\t replacement and we have found one in a C# verbatim string literal.
 warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 
 # Meaning of the settings:
@@ -2695,7 +2207,7 @@
 #       `set BOOL __AND__ __OR__`
 #
 #     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' → 'BOOL'
+#     'CT_' prefix: 'CT_BOOL' -> 'BOOL'
 #
 #
 # - Token(s) can be treated as type(s) with the 'type' option.
@@ -2719,7 +2231,7 @@
 #       `file_ext CPP .ch .cxx .cpp.in`
 #
 #     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' → 'CPP'
+#     them without the 'LANG_' prefix: 'LANG_CPP' -> 'CPP'
 #
 #
 # - Custom macro-based indentation can be set up using 'macro-open',
diff -ru orig/uncrustify-uncrustify-0.68.1/etc/uigui_uncrustify.ini new/uncrustify-uncrustify-0.68.1/etc/uigui_uncrustify.ini
--- orig/uncrustify-uncrustify-0.68.1/etc/uigui_uncrustify.ini	2018-11-20 18:04:30.000000000 +0100
+++ new/uncrustify-uncrustify-0.68.1/etc/uigui_uncrustify.ini	2018-11-22 09:59:35.000000000 +0100
@@ -1,5 +1,5 @@
 [header]
-categories=General options|Spacing options|Indenting options|Newline adding and removing options|Blank line options|Positioning options|Line splitting options|Code alignment options (not left column spaces/tabs)|Comment modification options|Code modifying options (non-whitespace)|Preprocessor options|Sort includes options|Use or Do not Use options|Warn levels - 1: error, 2: warning (default), 3: note
+categories=General options|Spacing options|Indenting|Newline adding and removing options|Blank line options|Positioning options|Line Splitting options|Code alignment (not left column spaces/tabs)|Comment modifications|Code modifying options (non-whitespace)|Preprocessor options|Sort includes options|Use or Do not Use options|Warn levels - 1: error, 2: warning (default), 3: note
 cfgFileParameterEnding=cr
 configFilename=uncrustify.cfg
 fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.cp|*.C|*.CPP|*.c++|*.di|*.m|*.mm|*.sqc|*.es
@@ -15,20 +15,20 @@
 showHelpParameter=-h
 stringparaminquotes=false
 useCfgFileParameter="-c "
-version=Uncrustify-0.68
+version=Uncrustify-0.67
 
 [Newlines]
 Category=0
-Description="<html>The type of line endings.<br/><br/>Default: auto</html>"
+Description="<html>The type of line endings. Default=Auto.</html>"
 Enabled=false
 EditorType=multiple
-Choices=newlines=lf|newlines=crlf|newlines=cr|newlines=auto
+Choices="newlines=lf|newlines=crlf|newlines=cr|newlines=auto"
 ChoicesReadable="Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto"
-ValueDefault=auto
+ValueDefault=3
 
 [Input Tab Size]
 Category=0
-Description="<html>The original size of tabs in the input.<br/><br/>Default: 8</html>"
+Description="<html>The original size of tabs in the input. Default=8.</html>"
 Enabled=false
 EditorType=numeric
 CallName="input_tab_size="
@@ -38,7 +38,7 @@
 
 [Output Tab Size]
 Category=0
-Description="<html>The size of tabs in the output (only used if align_with_tabs=true).<br/><br/>Default: 8</html>"
+Description="<html>The size of tabs in the output (only used if align_with_tabs=true). Default=8.</html>"
 Enabled=false
 EditorType=numeric
 CallName="output_tab_size="
@@ -48,7 +48,7 @@
 
 [String Escape Char]
 Category=0
-Description="<html>The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).<br/><br/>Default: 92</html>"
+Description="<html>The ASCII value of the string escape char, usually 92 (\) or 94 (^). (Pawn).</html>"
 Enabled=false
 EditorType=numeric
 CallName="string_escape_char="
@@ -58,7 +58,7 @@
 
 [String Escape Char2]
 Category=0
-Description="<html>Alternate string escape char (usually only used for Pawn).<br/>Only works right before the quote char.</html>"
+Description="<html>Alternate string escape char for Pawn. Only works right before the quote char.</html>"
 Enabled=false
 EditorType=numeric
 CallName="string_escape_char2="
@@ -68,60 +68,60 @@
 
 [String Replace Tab Chars]
 Category=0
-Description="<html>Replace tab characters found in string literals with the escape sequence \t<br/>instead.</html>"
+Description="<html>Replace tab characters found in string literals with the escape sequence \t instead.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=string_replace_tab_chars=true|string_replace_tab_chars=false
-ValueDefault=false
+ValueDefault=0
 
 [Tok Split Gte]
 Category=0
-Description="<html>Allow interpreting '&gt;=' and '&gt;&gt;=' as part of a template in code like<br/>'void f(list&lt;list&lt;B&gt;&gt;=val);'. If true, 'assert(x&lt;0 &amp;&amp; y&gt;=3)' will be broken.<br/>Improvements to template detection may make this option obsolete.</html>"
+Description="<html>Allow interpreting '&gt;=' and '&gt;&gt;=' as part of a template in 'void f(list&lt;list&lt;B&gt;&gt;=val);'.<BR>If True, 'assert(x&lt;0 &amp;&amp; y&gt;=3)' will be broken. Default=False<BR>Improvements to template detection may make this option obsolete.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=tok_split_gte=true|tok_split_gte=false
-ValueDefault=false
+ValueDefault=0
 
 [Disable Processing Cmt]
 Category=0
-Description="<html>Specify the marker used in comments to disable processing of part of the<br/>file.<br/><br/>Default:  *INDENT-OFF*</html>"
+Description="<html>Override the default ' *INDENT-OFF*' in comments for disabling processing of part of the file.</html>"
 Enabled=false
 CallName=disable_processing_cmt=
 EditorType=string
-ValueDefault= *INDENT-OFF*
+ValueDefault=
 
 [Enable Processing Cmt]
 Category=0
-Description="<html>Specify the marker used in comments to (re)enable processing in a file.<br/><br/>Default:  *INDENT-ON*</html>"
+Description="<html>Override the default ' *INDENT-ON*' in comments for enabling processing of part of the file.</html>"
 Enabled=false
 CallName=enable_processing_cmt=
 EditorType=string
-ValueDefault= *INDENT-ON*
+ValueDefault=
 
 [Enable Digraphs]
 Category=0
-Description="<html>Enable parsing of digraphs.</html>"
+Description="<html>Enable parsing of digraphs. Default=False.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=enable_digraphs=true|enable_digraphs=false
-ValueDefault=false
+ValueDefault=0
 
 [Utf8 Bom]
 Category=0
-Description="<html>Add or remove the UTF-8 BOM (recommend 'remove').</html>"
+Description="<html>Control what to do with the UTF-8 BOM (recommend 'remove').</html>"
 Enabled=false
 EditorType=multiple
-Choices=utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force
+Choices="utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force"
 ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
-ValueDefault=ignore
+ValueDefault=0
 
 [Utf8 Byte]
 Category=0
-Description="<html>If the file contains bytes with values between 128 and 255, but is not<br/>UTF-8, then output as UTF-8.</html>"
+Description="<html>If the file contains bytes with values between 128 and 255, but is not UTF-8, then output as UTF-8.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=utf8_byte=true|utf8_byte=false
-ValueDefault=false
+ValueDefault=0
 
 [Utf8 Force]
 Category=0
@@ -129,1830 +129,1758 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=utf8_force=true|utf8_force=false
-ValueDefault=false
+ValueDefault=0
 
 [Sp Arith]
 Category=1
-Description="<html>Add or remove space around non-assignment symbolic operators ('+', '/', '%',<br/>'&lt;&lt;', and so forth).</html>"
+Description="<html>Add or remove space around arithmetic operator '+', '-', '/', '*', etc<BR>also '&gt;&gt;&gt;' '&lt;&lt;' '&gt;&gt;' '%' '|'.</html>"
 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"
 ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Arith Additive]
 Category=1
-Description="<html>Add or remove space around arithmetic operators '+' and '-'.<br/><br/>Overrides sp_arith.</html>"
+Description="<html>Add or remove space around arithmetic operator '+' and '-'. Overrides sp_arith</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_arith_additive=ignore|sp_arith_additive=add|sp_arith_additive=remove|sp_arith_additive=force
+Choices="sp_arith_additive=ignore|sp_arith_additive=add|sp_arith_additive=remove|sp_arith_additive=force"
 ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Assign]
 Category=1
 Description="<html>Add or remove space around assignment operator '=', '+=', etc.</html>"
 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"
 ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cpp Lambda Assign]
 Category=1
-Description="<html>Add or remove space around '=' in C++11 lambda capture specifications.<br/><br/>Overrides sp_assign.</html>"
+Description="<html>Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_lambda_assign=ignore|sp_cpp_lambda_assign=add|sp_cpp_lambda_assign=remove|sp_cpp_lambda_assign=force
+Choices="sp_cpp_lambda_assign=ignore|sp_cpp_lambda_assign=add|sp_cpp_lambda_assign=remove|sp_cpp_lambda_assign=force"
 ChoicesReadable="Ignore Sp Cpp Lambda Assign|Add Sp Cpp Lambda Assign|Remove Sp Cpp Lambda Assign|Force Sp Cpp Lambda Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cpp Lambda Paren]
 Category=1
 Description="<html>Add or remove space after the capture specification in C++11 lambda.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_lambda_paren=ignore|sp_cpp_lambda_paren=add|sp_cpp_lambda_paren=remove|sp_cpp_lambda_paren=force
+Choices="sp_cpp_lambda_paren=ignore|sp_cpp_lambda_paren=add|sp_cpp_lambda_paren=remove|sp_cpp_lambda_paren=force"
 ChoicesReadable="Ignore Sp Cpp Lambda Paren|Add Sp Cpp Lambda Paren|Remove Sp Cpp Lambda Paren|Force Sp Cpp Lambda Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Assign Default]
 Category=1
 Description="<html>Add or remove space around assignment operator '=' in a prototype.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force
+Choices="sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force"
 ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Assign]
 Category=1
-Description="<html>Add or remove space before assignment operator '=', '+=', etc.<br/><br/>Overrides sp_assign.</html>"
+Description="<html>Add or remove space before assignment operator '=', '+=', etc. Overrides sp_assign.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_assign=ignore|sp_before_assign=add|sp_before_assign=remove|sp_before_assign=force
+Choices="sp_before_assign=ignore|sp_before_assign=add|sp_before_assign=remove|sp_before_assign=force"
 ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Assign]
 Category=1
-Description="<html>Add or remove space after assignment operator '=', '+=', etc.<br/><br/>Overrides sp_assign.</html>"
+Description="<html>Add or remove space after assignment operator '=', '+=', etc. Overrides sp_assign.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_assign=ignore|sp_after_assign=add|sp_after_assign=remove|sp_after_assign=force
+Choices="sp_after_assign=ignore|sp_after_assign=add|sp_after_assign=remove|sp_after_assign=force"
 ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Enum Paren]
 Category=1
 Description="<html>Add or remove space in 'NS_ENUM ('.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_enum_paren=ignore|sp_enum_paren=add|sp_enum_paren=remove|sp_enum_paren=force
+Choices="sp_enum_paren=ignore|sp_enum_paren=add|sp_enum_paren=remove|sp_enum_paren=force"
 ChoicesReadable="Ignore Sp Enum Paren|Add Sp Enum Paren|Remove Sp Enum Paren|Force Sp Enum Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Enum Assign]
 Category=1
 Description="<html>Add or remove space around assignment '=' in enum.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_enum_assign=ignore|sp_enum_assign=add|sp_enum_assign=remove|sp_enum_assign=force
+Choices="sp_enum_assign=ignore|sp_enum_assign=add|sp_enum_assign=remove|sp_enum_assign=force"
 ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Enum Before Assign]
 Category=1
-Description="<html>Add or remove space before assignment '=' in enum.<br/><br/>Overrides sp_enum_assign.</html>"
+Description="<html>Add or remove space before assignment '=' in enum. Overrides sp_enum_assign.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_enum_before_assign=ignore|sp_enum_before_assign=add|sp_enum_before_assign=remove|sp_enum_before_assign=force
+Choices="sp_enum_before_assign=ignore|sp_enum_before_assign=add|sp_enum_before_assign=remove|sp_enum_before_assign=force"
 ChoicesReadable="Ignore Sp Enum Before Assign|Add Sp Enum Before Assign|Remove Sp Enum Before Assign|Force Sp Enum Before Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Enum After Assign]
 Category=1
-Description="<html>Add or remove space after assignment '=' in enum.<br/><br/>Overrides sp_enum_assign.</html>"
+Description="<html>Add or remove space after assignment '=' in enum. Overrides sp_enum_assign.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_enum_after_assign=ignore|sp_enum_after_assign=add|sp_enum_after_assign=remove|sp_enum_after_assign=force
+Choices="sp_enum_after_assign=ignore|sp_enum_after_assign=add|sp_enum_after_assign=remove|sp_enum_after_assign=force"
 ChoicesReadable="Ignore Sp Enum After Assign|Add Sp Enum After Assign|Remove Sp Enum After Assign|Force Sp Enum After Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Enum Colon]
 Category=1
 Description="<html>Add or remove space around assignment ':' in enum.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_enum_colon=ignore|sp_enum_colon=add|sp_enum_colon=remove|sp_enum_colon=force
+Choices="sp_enum_colon=ignore|sp_enum_colon=add|sp_enum_colon=remove|sp_enum_colon=force"
 ChoicesReadable="Ignore Sp Enum Colon|Add Sp Enum Colon|Remove Sp Enum Colon|Force Sp Enum Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Pp Concat]
 Category=1
-Description="<html>Add or remove space around preprocessor '##' concatenation operator.<br/><br/>Default: add</html>"
+Description="<html>Add or remove space around preprocessor '##' concatenation operator. Default=Add.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force
+Choices="sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force"
 ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat"
-ValueDefault=add
+ValueDefault=1
 
 [Sp Pp Stringify]
 Category=1
-Description="<html>Add or remove space after preprocessor '#' stringify operator.<br/>Also affects the '#@' charizing operator.</html>"
+Description="<html>Add or remove space after preprocessor '#' stringify operator. Also affects the '#@' charizing operator.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_pp_stringify=ignore|sp_pp_stringify=add|sp_pp_stringify=remove|sp_pp_stringify=force
+Choices="sp_pp_stringify=ignore|sp_pp_stringify=add|sp_pp_stringify=remove|sp_pp_stringify=force"
 ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Pp Stringify]
 Category=1
-Description="<html>Add or remove space before preprocessor '#' stringify operator<br/>as in '#define x(y) L#y'.</html>"
+Description="<html>Add or remove space before preprocessor '#' stringify operator as in '#define x(y) L#y'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_pp_stringify=ignore|sp_before_pp_stringify=add|sp_before_pp_stringify=remove|sp_before_pp_stringify=force
+Choices="sp_before_pp_stringify=ignore|sp_before_pp_stringify=add|sp_before_pp_stringify=remove|sp_before_pp_stringify=force"
 ChoicesReadable="Ignore Sp Before Pp Stringify|Add Sp Before Pp Stringify|Remove Sp Before Pp Stringify|Force Sp Before Pp Stringify"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Bool]
 Category=1
 Description="<html>Add or remove space around boolean operators '&amp;&amp;' and '||'.</html>"
 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"
 ChoicesReadable="Ignore Sp Bool|Add Sp Bool|Remove Sp Bool|Force Sp Bool"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Compare]
 Category=1
 Description="<html>Add or remove space around compare operator '&lt;', '&gt;', '==', etc.</html>"
 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"
 ChoicesReadable="Ignore Sp Compare|Add Sp Compare|Remove Sp Compare|Force Sp Compare"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Paren]
 Category=1
 Description="<html>Add or remove space inside '(' and ')'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Paren|Add Sp Inside Paren|Remove Sp Inside Paren|Force Sp Inside Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Paren Paren]
 Category=1
-Description="<html>Add or remove space between nested parentheses, i.e. '((' vs. ') )'.</html>"
+Description="<html>Add or remove space between nested parens: '((' vs ') )'.</html>"
 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"
 ChoicesReadable="Ignore Sp Paren Paren|Add Sp Paren Paren|Remove Sp Paren Paren|Force Sp Paren Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cparen Oparen]
 Category=1
-Description="<html>Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.</html>"
+Description="<html>Add or remove space between back-to-back parens: ')(' vs ') ('.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cparen_oparen=ignore|sp_cparen_oparen=add|sp_cparen_oparen=remove|sp_cparen_oparen=force
+Choices="sp_cparen_oparen=ignore|sp_cparen_oparen=add|sp_cparen_oparen=remove|sp_cparen_oparen=force"
 ChoicesReadable="Ignore Sp Cparen Oparen|Add Sp Cparen Oparen|Remove Sp Cparen Oparen|Force Sp Cparen Oparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Balance Nested Parens]
 Category=1
-Description="<html>Whether to balance spaces inside nested parentheses.</html>"
+Description="<html>Whether to balance spaces inside nested parens.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=sp_balance_nested_parens=true|sp_balance_nested_parens=false
-ValueDefault=false
+ValueDefault=0
 
 [Sp Paren Brace]
 Category=1
 Description="<html>Add or remove space between ')' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Sp Paren Brace|Add Sp Paren Brace|Remove Sp Paren Brace|Force Sp Paren Brace"
-ValueDefault=ignore
-
-[Sp Brace Brace]
-Category=1
-Description="<html>Add or remove space between nested braces, i.e. '{{' vs '{ {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_brace=ignore|sp_brace_brace=add|sp_brace_brace=remove|sp_brace_brace=force
-ChoicesReadable="Ignore Sp Brace Brace|Add Sp Brace Brace|Remove Sp Brace Brace|Force Sp Brace Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Ptr Star]
 Category=1
 Description="<html>Add or remove space before pointer star '*'.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Ptr Star|Add Sp Before Ptr Star|Remove Sp Before Ptr Star|Force Sp Before Ptr Star"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Unnamed Ptr Star]
 Category=1
-Description="<html>Add or remove space before pointer star '*' that isn't followed by a<br/>variable name. If set to 'ignore', sp_before_ptr_star is used instead.</html>"
+Description="<html>Add or remove space before pointer star '*' that isn't followed by a variable name<BR>If set to 'ignore', sp_before_ptr_star is used instead.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_unnamed_ptr_star=ignore|sp_before_unnamed_ptr_star=add|sp_before_unnamed_ptr_star=remove|sp_before_unnamed_ptr_star=force
+Choices="sp_before_unnamed_ptr_star=ignore|sp_before_unnamed_ptr_star=add|sp_before_unnamed_ptr_star=remove|sp_before_unnamed_ptr_star=force"
 ChoicesReadable="Ignore Sp Before Unnamed Ptr Star|Add Sp Before Unnamed Ptr Star|Remove Sp Before Unnamed Ptr Star|Force Sp Before Unnamed Ptr Star"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Between Ptr Star]
 Category=1
 Description="<html>Add or remove space between pointer stars '*'.</html>"
 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"
 ChoicesReadable="Ignore Sp Between Ptr Star|Add Sp Between Ptr Star|Remove Sp Between Ptr Star|Force Sp Between Ptr Star"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Ptr Star]
 Category=1
 Description="<html>Add or remove space after pointer star '*', if followed by a word.</html>"
 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"
 ChoicesReadable="Ignore Sp After Ptr Star|Add Sp After Ptr Star|Remove Sp After Ptr Star|Force Sp After Ptr Star"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Ptr Block Caret]
 Category=1
 Description="<html>Add or remove space after pointer caret '^', if followed by a word.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_ptr_block_caret=ignore|sp_after_ptr_block_caret=add|sp_after_ptr_block_caret=remove|sp_after_ptr_block_caret=force
+Choices="sp_after_ptr_block_caret=ignore|sp_after_ptr_block_caret=add|sp_after_ptr_block_caret=remove|sp_after_ptr_block_caret=force"
 ChoicesReadable="Ignore Sp After Ptr Block Caret|Add Sp After Ptr Block Caret|Remove Sp After Ptr Block Caret|Force Sp After Ptr Block Caret"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Ptr Star Qualifier]
 Category=1
 Description="<html>Add or remove space after pointer star '*', if followed by a qualifier.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_ptr_star_qualifier=ignore|sp_after_ptr_star_qualifier=add|sp_after_ptr_star_qualifier=remove|sp_after_ptr_star_qualifier=force
+Choices="sp_after_ptr_star_qualifier=ignore|sp_after_ptr_star_qualifier=add|sp_after_ptr_star_qualifier=remove|sp_after_ptr_star_qualifier=force"
 ChoicesReadable="Ignore Sp After Ptr Star Qualifier|Add Sp After Ptr Star Qualifier|Remove Sp After Ptr Star Qualifier|Force Sp After Ptr Star Qualifier"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Ptr Star Func]
 Category=1
-Description="<html>Add or remove space after a pointer star '*', if followed by a function<br/>prototype or function definition.</html>"
+Description="<html>Add or remove space after a pointer star '*', if followed by a func proto/def.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_ptr_star_func=ignore|sp_after_ptr_star_func=add|sp_after_ptr_star_func=remove|sp_after_ptr_star_func=force
+Choices="sp_after_ptr_star_func=ignore|sp_after_ptr_star_func=add|sp_after_ptr_star_func=remove|sp_after_ptr_star_func=force"
 ChoicesReadable="Ignore Sp After Ptr Star Func|Add Sp After Ptr Star Func|Remove Sp After Ptr Star Func|Force Sp After Ptr Star Func"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Ptr Star Paren]
 Category=1
-Description="<html>Add or remove space after a pointer star '*', if followed by an open<br/>parenthesis, as in 'void* (*)().</html>"
+Description="<html>Add or remove space after a pointer star '*', if followed by an open paren (function types).</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ptr_star_paren=ignore|sp_ptr_star_paren=add|sp_ptr_star_paren=remove|sp_ptr_star_paren=force
+Choices="sp_ptr_star_paren=ignore|sp_ptr_star_paren=add|sp_ptr_star_paren=remove|sp_ptr_star_paren=force"
 ChoicesReadable="Ignore Sp Ptr Star Paren|Add Sp Ptr Star Paren|Remove Sp Ptr Star Paren|Force Sp Ptr Star Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Ptr Star Func]
 Category=1
-Description="<html>Add or remove space before a pointer star '*', if followed by a function<br/>prototype or function definition.</html>"
+Description="<html>Add or remove space before a pointer star '*', if followed by a func proto/def.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_ptr_star_func=ignore|sp_before_ptr_star_func=add|sp_before_ptr_star_func=remove|sp_before_ptr_star_func=force
+Choices="sp_before_ptr_star_func=ignore|sp_before_ptr_star_func=add|sp_before_ptr_star_func=remove|sp_before_ptr_star_func=force"
 ChoicesReadable="Ignore Sp Before Ptr Star Func|Add Sp Before Ptr Star Func|Remove Sp Before Ptr Star Func|Force Sp Before Ptr Star Func"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Byref]
 Category=1
 Description="<html>Add or remove space before a reference sign '&amp;'.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Byref|Add Sp Before Byref|Remove Sp Before Byref|Force Sp Before Byref"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Unnamed Byref]
 Category=1
-Description="<html>Add or remove space before a reference sign '&amp;' that isn't followed by a<br/>variable name. If set to 'ignore', sp_before_byref is used instead.</html>"
+Description="<html>Add or remove space before a reference sign '&amp;' that isn't followed by a variable name.<BR>If set to 'ignore', sp_before_byref is used instead.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_unnamed_byref=ignore|sp_before_unnamed_byref=add|sp_before_unnamed_byref=remove|sp_before_unnamed_byref=force
+Choices="sp_before_unnamed_byref=ignore|sp_before_unnamed_byref=add|sp_before_unnamed_byref=remove|sp_before_unnamed_byref=force"
 ChoicesReadable="Ignore Sp Before Unnamed Byref|Add Sp Before Unnamed Byref|Remove Sp Before Unnamed Byref|Force Sp Before Unnamed Byref"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Byref]
 Category=1
 Description="<html>Add or remove space after reference sign '&amp;', if followed by a word.</html>"
 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"
 ChoicesReadable="Ignore Sp After Byref|Add Sp After Byref|Remove Sp After Byref|Force Sp After Byref"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Byref Func]
 Category=1
-Description="<html>Add or remove space after a reference sign '&amp;', if followed by a function<br/>prototype or function definition.</html>"
+Description="<html>Add or remove space after a reference sign '&amp;', if followed by a func proto/def.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_byref_func=ignore|sp_after_byref_func=add|sp_after_byref_func=remove|sp_after_byref_func=force
+Choices="sp_after_byref_func=ignore|sp_after_byref_func=add|sp_after_byref_func=remove|sp_after_byref_func=force"
 ChoicesReadable="Ignore Sp After Byref Func|Add Sp After Byref Func|Remove Sp After Byref Func|Force Sp After Byref Func"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Byref Func]
 Category=1
-Description="<html>Add or remove space before a reference sign '&amp;', if followed by a function<br/>prototype or function definition.</html>"
+Description="<html>Add or remove space before a reference sign '&amp;', if followed by a func proto/def.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_byref_func=ignore|sp_before_byref_func=add|sp_before_byref_func=remove|sp_before_byref_func=force
+Choices="sp_before_byref_func=ignore|sp_before_byref_func=add|sp_before_byref_func=remove|sp_before_byref_func=force"
 ChoicesReadable="Ignore Sp Before Byref Func|Add Sp Before Byref Func|Remove Sp Before Byref Func|Force Sp Before Byref Func"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Type]
 Category=1
-Description="<html>Add or remove space between type and word.<br/><br/>Default: force</html>"
+Description="<html>Add or remove space between type and word. Default=Force.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force
+Choices="sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force"
 ChoicesReadable="Ignore Sp After Type|Add Sp After Type|Remove Sp After Type|Force Sp After Type"
-ValueDefault=force
-
-[Sp After Decltype]
-Category=1
-Description="<html>Add or remove space between 'decltype(...)' and word.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_decltype=ignore|sp_after_decltype=add|sp_after_decltype=remove|sp_after_decltype=force
-ChoicesReadable="Ignore Sp After Decltype|Add Sp After Decltype|Remove Sp After Decltype|Force Sp After Decltype"
-ValueDefault=ignore
+ValueDefault=3
 
 [Sp Before Template Paren]
 Category=1
-Description="<html>(D) Add or remove space before the parenthesis in the D constructs<br/>'template Foo(' and 'class Foo('.</html>"
+Description="<html>Add or remove space before the paren in the D constructs 'template Foo(' and 'class Foo('.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_template_paren=ignore|sp_before_template_paren=add|sp_before_template_paren=remove|sp_before_template_paren=force
+Choices="sp_before_template_paren=ignore|sp_before_template_paren=add|sp_before_template_paren=remove|sp_before_template_paren=force"
 ChoicesReadable="Ignore Sp Before Template Paren|Add Sp Before Template Paren|Remove Sp Before Template Paren|Force Sp Before Template Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Template Angle]
 Category=1
-Description="<html>Add or remove space between 'template' and '&lt;'.<br/>If set to ignore, sp_before_angle is used.</html>"
+Description="<html>Add or remove space in 'template &lt;' vs 'template&lt;'.<BR>If set to ignore, sp_before_angle is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_template_angle=ignore|sp_template_angle=add|sp_template_angle=remove|sp_template_angle=force
+Choices="sp_template_angle=ignore|sp_template_angle=add|sp_template_angle=remove|sp_template_angle=force"
 ChoicesReadable="Ignore Sp Template Angle|Add Sp Template Angle|Remove Sp Template Angle|Force Sp Template Angle"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Angle]
 Category=1
-Description="<html>Add or remove space before '&lt;'.</html>"
+Description="<html>Add or remove space before '&lt;&gt;'.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Angle|Add Sp Before Angle|Remove Sp Before Angle|Force Sp Before Angle"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Angle]
 Category=1
 Description="<html>Add or remove space inside '&lt;' and '&gt;'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Angle|Add Sp Inside Angle|Remove Sp Inside Angle|Force Sp Inside Angle"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Angle Colon]
 Category=1
-Description="<html>Add or remove space between '&gt;' and ':'.</html>"
+Description="<html>Add or remove space between '&lt;&gt;' and ':'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_angle_colon=ignore|sp_angle_colon=add|sp_angle_colon=remove|sp_angle_colon=force
+Choices="sp_angle_colon=ignore|sp_angle_colon=add|sp_angle_colon=remove|sp_angle_colon=force"
 ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Angle]
 Category=1
 Description="<html>Add or remove space after '&lt;&gt;'.</html>"
 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"
 ChoicesReadable="Ignore Sp After Angle|Add Sp After Angle|Remove Sp After Angle|Force Sp After Angle"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Angle Paren]
 Category=1
-Description="<html>Add or remove space between '&gt;' and '(' as found in 'new List&lt;byte&gt;(foo);'.</html>"
+Description="<html>Add or remove space between '&lt;&gt;' and '(' as found in 'new List&lt;byte&gt;(foo);'.</html>"
 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"
 ChoicesReadable="Ignore Sp Angle Paren|Add Sp Angle Paren|Remove Sp Angle Paren|Force Sp Angle Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Angle Paren Empty]
 Category=1
-Description="<html>Add or remove space between '&gt;' and '()' as found in 'new List&lt;byte&gt;();'.</html>"
+Description="<html>Add or remove space between '&lt;&gt;' and '()' as found in 'new List&lt;byte&gt;();'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_angle_paren_empty=ignore|sp_angle_paren_empty=add|sp_angle_paren_empty=remove|sp_angle_paren_empty=force
+Choices="sp_angle_paren_empty=ignore|sp_angle_paren_empty=add|sp_angle_paren_empty=remove|sp_angle_paren_empty=force"
 ChoicesReadable="Ignore Sp Angle Paren Empty|Add Sp Angle Paren Empty|Remove Sp Angle Paren Empty|Force Sp Angle Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Angle Word]
 Category=1
-Description="<html>Add or remove space between '&gt;' and a word as in 'List&lt;byte&gt; m;' or<br/>'template &lt;typename T&gt; static ...'.</html>"
+Description="<html>Add or remove space between '&lt;&gt;' and a word as in 'List&lt;byte&gt; m;' or 'template &lt;typename T&gt; static ...'.</html>"
 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"
 ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Angle Shift]
 Category=1
-Description="<html>Add or remove space between '&gt;' and '&gt;' in '&gt;&gt;' (template stuff).<br/><br/>Default: add</html>"
+Description="<html>Add or remove space between '&gt;' and '&gt;' in '&gt;&gt;' (template stuff). Default=Add.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force
+Choices="sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force"
 ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift"
-ValueDefault=add
+ValueDefault=1
 
 [Sp Permit Cpp11 Shift]
 Category=1
-Description="<html>(C++11) Permit removal of the space between '&gt;&gt;' in 'foo&lt;bar&lt;int&gt; &gt;'. Note<br/>that sp_angle_shift cannot remove the space without this option.</html>"
+Description="<html>Permit removal of the space between '&gt;&gt;' in 'foo&lt;bar&lt;int&gt; &gt;' (C++11 only). Default=False.<BR>sp_angle_shift cannot remove the space without this option.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=sp_permit_cpp11_shift=true|sp_permit_cpp11_shift=false
-ValueDefault=false
+ValueDefault=0
 
 [Sp Before Sparen]
 Category=1
-Description="<html>Add or remove space before '(' of control statements ('if', 'for', 'switch',<br/>'while', etc.).</html>"
+Description="<html>Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Sparen|Add Sp Before Sparen|Remove Sp Before Sparen|Force Sp Before Sparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Sparen]
 Category=1
-Description="<html>Add or remove space inside '(' and ')' of control statements.</html>"
+Description="<html>Add or remove space inside if-condition '(' and ')'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen"
-ValueDefault=ignore
+ValueDefault=0
 
-[Sp Inside Sparen Open]
+[Sp Inside Sparen Close]
 Category=1
-Description="<html>Add or remove space after '(' of control statements.<br/><br/>Overrides sp_inside_sparen.</html>"
+Description="<html>Add or remove space before if-condition ')'. Overrides sp_inside_sparen.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_sparen_open=ignore|sp_inside_sparen_open=add|sp_inside_sparen_open=remove|sp_inside_sparen_open=force
-ChoicesReadable="Ignore Sp Inside Sparen Open|Add Sp Inside Sparen Open|Remove Sp Inside Sparen Open|Force Sp Inside Sparen Open"
-ValueDefault=ignore
+Choices="sp_inside_sparen_close=ignore|sp_inside_sparen_close=add|sp_inside_sparen_close=remove|sp_inside_sparen_close=force"
+ChoicesReadable="Ignore Sp Inside Sparen Close|Add Sp Inside Sparen Close|Remove Sp Inside Sparen Close|Force Sp Inside Sparen Close"
+ValueDefault=0
 
-[Sp Inside Sparen Close]
+[Sp Inside Sparen Open]
 Category=1
-Description="<html>Add or remove space before ')' of control statements.<br/><br/>Overrides sp_inside_sparen.</html>"
+Description="<html>Add or remove space after if-condition '('. Overrides sp_inside_sparen.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_sparen_close=ignore|sp_inside_sparen_close=add|sp_inside_sparen_close=remove|sp_inside_sparen_close=force
-ChoicesReadable="Ignore Sp Inside Sparen Close|Add Sp Inside Sparen Close|Remove Sp Inside Sparen Close|Force Sp Inside Sparen Close"
-ValueDefault=ignore
+Choices="sp_inside_sparen_open=ignore|sp_inside_sparen_open=add|sp_inside_sparen_open=remove|sp_inside_sparen_open=force"
+ChoicesReadable="Ignore Sp Inside Sparen Open|Add Sp Inside Sparen Open|Remove Sp Inside Sparen Open|Force Sp Inside Sparen Open"
+ValueDefault=0
 
 [Sp After Sparen]
 Category=1
-Description="<html>Add or remove space after ')' of control statements.</html>"
+Description="<html>Add or remove space after ')' of 'if', 'for', 'switch', and 'while', etc.</html>"
 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"
 ChoicesReadable="Ignore Sp After Sparen|Add Sp After Sparen|Remove Sp After Sparen|Force Sp After Sparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Sparen Brace]
 Category=1
-Description="<html>Add or remove space between ')' and '{' of of control statements.</html>"
+Description="<html>Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc.</html>"
 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"
 ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Invariant Paren]
 Category=1
-Description="<html>(D) Add or remove space between 'invariant' and '('.</html>"
+Description="<html>Add or remove space between 'invariant' and '(' in the D language.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_invariant_paren=ignore|sp_invariant_paren=add|sp_invariant_paren=remove|sp_invariant_paren=force
+Choices="sp_invariant_paren=ignore|sp_invariant_paren=add|sp_invariant_paren=remove|sp_invariant_paren=force"
 ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Invariant Paren]
 Category=1
-Description="<html>(D) Add or remove space after the ')' in 'invariant (C) c'.</html>"
+Description="<html>Add or remove space after the ')' in 'invariant (C) c' in the D language.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_invariant_paren=ignore|sp_after_invariant_paren=add|sp_after_invariant_paren=remove|sp_after_invariant_paren=force
+Choices="sp_after_invariant_paren=ignore|sp_after_invariant_paren=add|sp_after_invariant_paren=remove|sp_after_invariant_paren=force"
 ChoicesReadable="Ignore Sp After Invariant Paren|Add Sp After Invariant Paren|Remove Sp After Invariant Paren|Force Sp After Invariant Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Special Semi]
 Category=1
 Description="<html>Add or remove space before empty statement ';' on 'if', 'for' and 'while'.</html>"
 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"
 ChoicesReadable="Ignore Sp Special Semi|Add Sp Special Semi|Remove Sp Special Semi|Force Sp Special Semi"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Semi]
 Category=1
-Description="<html>Add or remove space before ';'.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space before ';'. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force
+Choices="sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force"
 ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Before Semi For]
 Category=1
 Description="<html>Add or remove space before ';' in non-empty 'for' statements.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Semi For|Add Sp Before Semi For|Remove Sp Before Semi For|Force Sp Before Semi For"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Semi For Empty]
 Category=1
 Description="<html>Add or remove space before a semicolon of an empty part of a for statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_semi_for_empty=ignore|sp_before_semi_for_empty=add|sp_before_semi_for_empty=remove|sp_before_semi_for_empty=force
+Choices="sp_before_semi_for_empty=ignore|sp_before_semi_for_empty=add|sp_before_semi_for_empty=remove|sp_before_semi_for_empty=force"
 ChoicesReadable="Ignore Sp Before Semi For Empty|Add Sp Before Semi For Empty|Remove Sp Before Semi For Empty|Force Sp Before Semi For Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Semi]
 Category=1
-Description="<html>Add or remove space after ';', except when followed by a comment.<br/><br/>Default: add</html>"
+Description="<html>Add or remove space after ';', except when followed by a comment. Default=Add.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force
+Choices="sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force"
 ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
-ValueDefault=add
+ValueDefault=1
 
 [Sp After Semi For]
 Category=1
-Description="<html>Add or remove space after ';' in non-empty 'for' statements.<br/><br/>Default: force</html>"
+Description="<html>Add or remove space after ';' in non-empty 'for' statements. Default=Force.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_semi_for=ignore|sp_after_semi_for=add|sp_after_semi_for=remove|sp_after_semi_for=force
+Choices="sp_after_semi_for=ignore|sp_after_semi_for=add|sp_after_semi_for=remove|sp_after_semi_for=force"
 ChoicesReadable="Ignore Sp After Semi For|Add Sp After Semi For|Remove Sp After Semi For|Force Sp After Semi For"
-ValueDefault=force
+ValueDefault=3
 
 [Sp After Semi For Empty]
 Category=1
-Description="<html>Add or remove space after the final semicolon of an empty part of a for<br/>statement, as in 'for ( ; ; &lt;here&gt; )'.</html>"
+Description="<html>Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; &lt;here&gt; ).</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_semi_for_empty=ignore|sp_after_semi_for_empty=add|sp_after_semi_for_empty=remove|sp_after_semi_for_empty=force
+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"
 ChoicesReadable="Ignore Sp After Semi For Empty|Add Sp After Semi For Empty|Remove Sp After Semi For Empty|Force Sp After Semi For Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Square]
 Category=1
 Description="<html>Add or remove space before '[' (except '[]').</html>"
 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"
 ChoicesReadable="Ignore Sp Before Square|Add Sp Before Square|Remove Sp Before Square|Force Sp Before Square"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Squares]
 Category=1
 Description="<html>Add or remove space before '[]'.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Squares|Add Sp Before Squares|Remove Sp Before Squares|Force Sp Before Squares"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cpp Before Struct Binding]
 Category=1
-Description="<html>Add or remove space before C++17 structured bindings.</html>"
+Description="<html>Add or remove space before structured bindings. Only for C++17.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_before_struct_binding=ignore|sp_cpp_before_struct_binding=add|sp_cpp_before_struct_binding=remove|sp_cpp_before_struct_binding=force
+Choices="sp_cpp_before_struct_binding=ignore|sp_cpp_before_struct_binding=add|sp_cpp_before_struct_binding=remove|sp_cpp_before_struct_binding=force"
 ChoicesReadable="Ignore Sp Cpp Before Struct Binding|Add Sp Cpp Before Struct Binding|Remove Sp Cpp Before Struct Binding|Force Sp Cpp Before Struct Binding"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Square]
 Category=1
 Description="<html>Add or remove space inside a non-empty '[' and ']'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Square|Add Sp Inside Square|Remove Sp Inside Square|Force Sp Inside Square"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Square Oc Array]
 Category=1
-Description="<html>(OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and<br/>']'. If set to ignore, sp_inside_square is used.</html>"
+Description="<html>Add or remove space inside a non-empty OC boxed array '@[' and ']'.<BR>If set to ignore, sp_inside_square is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_square_oc_array=ignore|sp_inside_square_oc_array=add|sp_inside_square_oc_array=remove|sp_inside_square_oc_array=force
+Choices="sp_inside_square_oc_array=ignore|sp_inside_square_oc_array=add|sp_inside_square_oc_array=remove|sp_inside_square_oc_array=force"
 ChoicesReadable="Ignore Sp Inside Square Oc Array|Add Sp Inside Square Oc Array|Remove Sp Inside Square Oc Array|Force Sp Inside Square Oc Array"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Comma]
 Category=1
-Description="<html>Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.</html>"
+Description="<html>Add or remove space after ',', 'a,b' vs 'a, b'.</html>"
 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"
 ChoicesReadable="Ignore Sp After Comma|Add Sp After Comma|Remove Sp After Comma|Force Sp After Comma"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Comma]
 Category=1
-Description="<html>Add or remove space before ','.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space before ','. Default=Remove.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp After Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</html>"
+Description="<html>Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'. Only for C#.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_mdatype_commas=ignore|sp_after_mdatype_commas=add|sp_after_mdatype_commas=remove|sp_after_mdatype_commas=force
+Choices="sp_after_mdatype_commas=ignore|sp_after_mdatype_commas=add|sp_after_mdatype_commas=remove|sp_after_mdatype_commas=force"
 ChoicesReadable="Ignore Sp After Mdatype Commas|Add Sp After Mdatype Commas|Remove Sp After Mdatype Commas|Force Sp After Mdatype Commas"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
+Description="<html>Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'. Only for C#.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_mdatype_commas=ignore|sp_before_mdatype_commas=add|sp_before_mdatype_commas=remove|sp_before_mdatype_commas=force
+Choices="sp_before_mdatype_commas=ignore|sp_before_mdatype_commas=add|sp_before_mdatype_commas=remove|sp_before_mdatype_commas=force"
 ChoicesReadable="Ignore Sp Before Mdatype Commas|Add Sp Before Mdatype Commas|Remove Sp Before Mdatype Commas|Force Sp Before Mdatype Commas"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Between Mdatype Commas]
 Category=1
-Description="<html>(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</html>"
+Description="<html>Add or remove space between ',' in multidimensional array type 'int[,,]'. Only for C#.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_between_mdatype_commas=ignore|sp_between_mdatype_commas=add|sp_between_mdatype_commas=remove|sp_between_mdatype_commas=force
+Choices="sp_between_mdatype_commas=ignore|sp_between_mdatype_commas=add|sp_between_mdatype_commas=remove|sp_between_mdatype_commas=force"
 ChoicesReadable="Ignore Sp Between Mdatype Commas|Add Sp Between Mdatype Commas|Remove Sp Between Mdatype Commas|Force Sp Between Mdatype Commas"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Paren Comma]
 Category=1
-Description="<html>Add or remove space between an open parenthesis and comma,<br/>i.e. '(,' vs. '( ,'.<br/><br/>Default: force</html>"
+Description="<html>Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force
+Choices="sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force"
 ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
-ValueDefault=force
+ValueDefault=3
 
 [Sp Before Ellipsis]
 Category=1
-Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.</html>"
+Description="<html>Add or remove space before the variadic '...' when preceded by a non-punctuator.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force
+Choices="sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force"
 ChoicesReadable="Ignore Sp Before Ellipsis|Add Sp Before Ellipsis|Remove Sp Before Ellipsis|Force Sp Before Ellipsis"
-ValueDefault=ignore
-
-[Sp Type Ellipsis]
-Category=1
-Description="<html>Add or remove space between a type and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_ellipsis=ignore|sp_type_ellipsis=add|sp_type_ellipsis=remove|sp_type_ellipsis=force
-ChoicesReadable="Ignore Sp Type Ellipsis|Add Sp Type Ellipsis|Remove Sp Type Ellipsis|Force Sp Type Ellipsis"
-ValueDefault=ignore
-
-[Sp Paren Ellipsis]
-Category=1
-Description="<html>Add or remove space between ')' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_ellipsis=ignore|sp_paren_ellipsis=add|sp_paren_ellipsis=remove|sp_paren_ellipsis=force
-ChoicesReadable="Ignore Sp Paren Ellipsis|Add Sp Paren Ellipsis|Remove Sp Paren Ellipsis|Force Sp Paren Ellipsis"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Class Colon]
 Category=1
 Description="<html>Add or remove space after class ':'.</html>"
 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
+Choices="sp_after_class_colon=ignore|sp_after_class_colon=add|sp_after_class_colon=remove|sp_after_class_colon=force"
 ChoicesReadable="Ignore Sp After Class Colon|Add Sp After Class Colon|Remove Sp After Class Colon|Force Sp After Class Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Class Colon]
 Category=1
 Description="<html>Add or remove space before class ':'.</html>"
 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
+Choices="sp_before_class_colon=ignore|sp_before_class_colon=add|sp_before_class_colon=remove|sp_before_class_colon=force"
 ChoicesReadable="Ignore Sp Before Class Colon|Add Sp Before Class Colon|Remove Sp Before Class Colon|Force Sp Before Class Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Constr Colon]
 Category=1
 Description="<html>Add or remove space after class constructor ':'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_constr_colon=ignore|sp_after_constr_colon=add|sp_after_constr_colon=remove|sp_after_constr_colon=force
+Choices="sp_after_constr_colon=ignore|sp_after_constr_colon=add|sp_after_constr_colon=remove|sp_after_constr_colon=force"
 ChoicesReadable="Ignore Sp After Constr Colon|Add Sp After Constr Colon|Remove Sp After Constr Colon|Force Sp After Constr Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Constr Colon]
 Category=1
 Description="<html>Add or remove space before class constructor ':'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_constr_colon=ignore|sp_before_constr_colon=add|sp_before_constr_colon=remove|sp_before_constr_colon=force
+Choices="sp_before_constr_colon=ignore|sp_before_constr_colon=add|sp_before_constr_colon=remove|sp_before_constr_colon=force"
 ChoicesReadable="Ignore Sp Before Constr Colon|Add Sp Before Constr Colon|Remove Sp Before Constr Colon|Force Sp Before Constr Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Case Colon]
 Category=1
-Description="<html>Add or remove space before case ':'.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space before case ':'. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_case_colon=ignore|sp_before_case_colon=add|sp_before_case_colon=remove|sp_before_case_colon=force
+Choices="sp_before_case_colon=ignore|sp_before_case_colon=add|sp_before_case_colon=remove|sp_before_case_colon=force"
 ChoicesReadable="Ignore Sp Before Case Colon|Add Sp Before Case Colon|Remove Sp Before Case Colon|Force Sp Before Case Colon"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp After Operator]
 Category=1
 Description="<html>Add or remove space between 'operator' and operator sign.</html>"
 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"
 ChoicesReadable="Ignore Sp After Operator|Add Sp After Operator|Remove Sp After Operator|Force Sp After Operator"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Operator Sym]
 Category=1
-Description="<html>Add or remove space between the operator symbol and the open parenthesis, as<br/>in 'operator ++('.</html>"
+Description="<html>Add or remove space between the operator symbol and the open paren, as in 'operator ++('.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_operator_sym=ignore|sp_after_operator_sym=add|sp_after_operator_sym=remove|sp_after_operator_sym=force
+Choices="sp_after_operator_sym=ignore|sp_after_operator_sym=add|sp_after_operator_sym=remove|sp_after_operator_sym=force"
 ChoicesReadable="Ignore Sp After Operator Sym|Add Sp After Operator Sym|Remove Sp After Operator Sym|Force Sp After Operator Sym"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Operator Sym Empty]
 Category=1
-Description="<html>Overrides sp_after_operator_sym when the operator has no arguments, as in<br/>'operator *()'.</html>"
+Description="<html>Overrides sp_after_operator_sym when the operator has no arguments, as in 'operator *()'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_operator_sym_empty=ignore|sp_after_operator_sym_empty=add|sp_after_operator_sym_empty=remove|sp_after_operator_sym_empty=force
+Choices="sp_after_operator_sym_empty=ignore|sp_after_operator_sym_empty=add|sp_after_operator_sym_empty=remove|sp_after_operator_sym_empty=force"
 ChoicesReadable="Ignore Sp After Operator Sym Empty|Add Sp After Operator Sym Empty|Remove Sp After Operator Sym Empty|Force Sp After Operator Sym Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Cast]
 Category=1
-Description="<html>Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or<br/>'(int)a' vs. '(int) a'.</html>"
+Description="<html>Add or remove space after C/D cast, i.e. 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force
+Choices="sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force"
 ChoicesReadable="Ignore Sp After Cast|Add Sp After Cast|Remove Sp After Cast|Force Sp After Cast"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Paren Cast]
 Category=1
-Description="<html>Add or remove spaces inside cast parentheses.</html>"
+Description="<html>Add or remove spaces inside cast parens.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Paren Cast|Add Sp Inside Paren Cast|Remove Sp Inside Paren Cast|Force Sp Inside Paren Cast"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cpp Cast Paren]
 Category=1
-Description="<html>Add or remove space between the type and open parenthesis in a C++ cast,<br/>i.e. 'int(exp)' vs. 'int (exp)'.</html>"
+Description="<html>Add or remove space between the type and open paren in a C++ cast, i.e. 'int(exp)' vs 'int (exp)'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_cast_paren=ignore|sp_cpp_cast_paren=add|sp_cpp_cast_paren=remove|sp_cpp_cast_paren=force
+Choices="sp_cpp_cast_paren=ignore|sp_cpp_cast_paren=add|sp_cpp_cast_paren=remove|sp_cpp_cast_paren=force"
 ChoicesReadable="Ignore Sp Cpp Cast Paren|Add Sp Cpp Cast Paren|Remove Sp Cpp Cast Paren|Force Sp Cpp Cast Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Sizeof Paren]
 Category=1
 Description="<html>Add or remove space between 'sizeof' and '('.</html>"
 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"
 ChoicesReadable="Ignore Sp Sizeof Paren|Add Sp Sizeof Paren|Remove Sp Sizeof Paren|Force Sp Sizeof Paren"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis]
-Category=1
-Description="<html>Add or remove space between 'sizeof' and '...'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_ellipsis=ignore|sp_sizeof_ellipsis=add|sp_sizeof_ellipsis=remove|sp_sizeof_ellipsis=force
-ChoicesReadable="Ignore Sp Sizeof Ellipsis|Add Sp Sizeof Ellipsis|Remove Sp Sizeof Ellipsis|Force Sp Sizeof Ellipsis"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis Paren]
-Category=1
-Description="<html>Add or remove space between 'sizeof...' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sizeof_ellipsis_paren=ignore|sp_sizeof_ellipsis_paren=add|sp_sizeof_ellipsis_paren=remove|sp_sizeof_ellipsis_paren=force
-ChoicesReadable="Ignore Sp Sizeof Ellipsis Paren|Add Sp Sizeof Ellipsis Paren|Remove Sp Sizeof Ellipsis Paren|Force Sp Sizeof Ellipsis Paren"
-ValueDefault=ignore
-
-[Sp Decltype Paren]
-Category=1
-Description="<html>Add or remove space between 'decltype' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_decltype_paren=ignore|sp_decltype_paren=add|sp_decltype_paren=remove|sp_decltype_paren=force
-ChoicesReadable="Ignore Sp Decltype Paren|Add Sp Decltype Paren|Remove Sp Decltype Paren|Force Sp Decltype Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Tag]
 Category=1
-Description="<html>(Pawn) Add or remove space after the tag keyword.</html>"
+Description="<html>Add or remove space after the tag keyword (Pawn).</html>"
 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"
 ChoicesReadable="Ignore Sp After Tag|Add Sp After Tag|Remove Sp After Tag|Force Sp After Tag"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Braces Enum]
 Category=1
 Description="<html>Add or remove space inside enum '{' and '}'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Braces Enum|Add Sp Inside Braces Enum|Remove Sp Inside Braces Enum|Force Sp Inside Braces Enum"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Braces Struct]
 Category=1
 Description="<html>Add or remove space inside struct/union '{' and '}'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Braces Struct|Add Sp Inside Braces Struct|Remove Sp Inside Braces Struct|Force Sp Inside Braces Struct"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Braces Oc Dict]
 Category=1
-Description="<html>(OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'</html>"
+Description="<html>Add or remove space inside OC boxed dictionary @'{' and '}'</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_braces_oc_dict=ignore|sp_inside_braces_oc_dict=add|sp_inside_braces_oc_dict=remove|sp_inside_braces_oc_dict=force
+Choices="sp_inside_braces_oc_dict=ignore|sp_inside_braces_oc_dict=add|sp_inside_braces_oc_dict=remove|sp_inside_braces_oc_dict=force"
 ChoicesReadable="Ignore Sp Inside Braces Oc Dict|Add Sp Inside Braces Oc Dict|Remove Sp Inside Braces Oc Dict|Force Sp Inside Braces Oc Dict"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Type Brace Init Lst Open]
 Category=1
-Description="<html>Add or remove space after open brace in an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Add or remove space after open brace in an unnamed temporary direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_type_brace_init_lst_open=ignore|sp_after_type_brace_init_lst_open=add|sp_after_type_brace_init_lst_open=remove|sp_after_type_brace_init_lst_open=force
+Choices="sp_after_type_brace_init_lst_open=ignore|sp_after_type_brace_init_lst_open=add|sp_after_type_brace_init_lst_open=remove|sp_after_type_brace_init_lst_open=force"
 ChoicesReadable="Ignore Sp After Type Brace Init Lst Open|Add Sp After Type Brace Init Lst Open|Remove Sp After Type Brace Init Lst Open|Force Sp After Type Brace Init Lst Open"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Type Brace Init Lst Close]
 Category=1
-Description="<html>Add or remove space before close brace in an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Add or remove space before close brace in an unnamed temporary direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_type_brace_init_lst_close=ignore|sp_before_type_brace_init_lst_close=add|sp_before_type_brace_init_lst_close=remove|sp_before_type_brace_init_lst_close=force
+Choices="sp_before_type_brace_init_lst_close=ignore|sp_before_type_brace_init_lst_close=add|sp_before_type_brace_init_lst_close=remove|sp_before_type_brace_init_lst_close=force"
 ChoicesReadable="Ignore Sp Before Type Brace Init Lst Close|Add Sp Before Type Brace Init Lst Close|Remove Sp Before Type Brace Init Lst Close|Force Sp Before Type Brace Init Lst Close"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Type Brace Init Lst]
 Category=1
 Description="<html>Add or remove space inside an unnamed temporary direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_type_brace_init_lst=ignore|sp_inside_type_brace_init_lst=add|sp_inside_type_brace_init_lst=remove|sp_inside_type_brace_init_lst=force
+Choices="sp_inside_type_brace_init_lst=ignore|sp_inside_type_brace_init_lst=add|sp_inside_type_brace_init_lst=remove|sp_inside_type_brace_init_lst=force"
 ChoicesReadable="Ignore Sp Inside Type Brace Init Lst|Add Sp Inside Type Brace Init Lst|Remove Sp Inside Type Brace Init Lst|Force Sp Inside Type Brace Init Lst"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Braces]
 Category=1
 Description="<html>Add or remove space inside '{' and '}'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Braces|Add Sp Inside Braces|Remove Sp Inside Braces|Force Sp Inside Braces"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Braces Empty]
 Category=1
 Description="<html>Add or remove space inside '{}'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_braces_empty=ignore|sp_inside_braces_empty=add|sp_inside_braces_empty=remove|sp_inside_braces_empty=force
+Choices="sp_inside_braces_empty=ignore|sp_inside_braces_empty=add|sp_inside_braces_empty=remove|sp_inside_braces_empty=force"
 ChoicesReadable="Ignore Sp Inside Braces Empty|Add Sp Inside Braces Empty|Remove Sp Inside Braces Empty|Force Sp Inside Braces Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Type Func]
 Category=1
-Description="<html>Add or remove space between return type and function name. A minimum of 1<br/>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>"
 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"
 ChoicesReadable="Ignore Sp Type Func|Add Sp Type Func|Remove Sp Type Func|Force Sp Type Func"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Type Brace Init Lst]
 Category=1
-Description="<html>Add or remove space between type and open brace of an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Add or remove space between type and open brace of an unnamed temporary direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_type_brace_init_lst=ignore|sp_type_brace_init_lst=add|sp_type_brace_init_lst=remove|sp_type_brace_init_lst=force
+Choices="sp_type_brace_init_lst=ignore|sp_type_brace_init_lst=add|sp_type_brace_init_lst=remove|sp_type_brace_init_lst=force"
 ChoicesReadable="Ignore Sp Type Brace Init Lst|Add Sp Type Brace Init Lst|Remove Sp Type Brace Init Lst|Force Sp Type Brace Init Lst"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Proto Paren]
 Category=1
 Description="<html>Add or remove space between function name and '(' on function declaration.</html>"
 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"
 ChoicesReadable="Ignore Sp Func Proto Paren|Add Sp Func Proto Paren|Remove Sp Func Proto Paren|Force Sp Func Proto Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Proto Paren Empty]
 Category=1
-Description="<html>Add or remove space between function name and '()' on function declaration<br/>without parameters.</html>"
+Description="<html>Add or remove space between function name and '()' on function declaration without parameters.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_proto_paren_empty=ignore|sp_func_proto_paren_empty=add|sp_func_proto_paren_empty=remove|sp_func_proto_paren_empty=force
+Choices="sp_func_proto_paren_empty=ignore|sp_func_proto_paren_empty=add|sp_func_proto_paren_empty=remove|sp_func_proto_paren_empty=force"
 ChoicesReadable="Ignore Sp Func Proto Paren Empty|Add Sp Func Proto Paren Empty|Remove Sp Func Proto Paren Empty|Force Sp Func Proto Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Def Paren]
 Category=1
 Description="<html>Add or remove space between function name and '(' on function definition.</html>"
 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"
 ChoicesReadable="Ignore Sp Func Def Paren|Add Sp Func Def Paren|Remove Sp Func Def Paren|Force Sp Func Def Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Def Paren Empty]
 Category=1
-Description="<html>Add or remove space between function name and '()' on function definition<br/>without parameters.</html>"
+Description="<html>Add or remove space between function name and '()' on function definition without parameters.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_def_paren_empty=ignore|sp_func_def_paren_empty=add|sp_func_def_paren_empty=remove|sp_func_def_paren_empty=force
+Choices="sp_func_def_paren_empty=ignore|sp_func_def_paren_empty=add|sp_func_def_paren_empty=remove|sp_func_def_paren_empty=force"
 ChoicesReadable="Ignore Sp Func Def Paren Empty|Add Sp Func Def Paren Empty|Remove Sp Func Def Paren Empty|Force Sp Func Def Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Fparens]
 Category=1
 Description="<html>Add or remove space inside empty function '()'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Fparens|Add Sp Inside Fparens|Remove Sp Inside Fparens|Force Sp Inside Fparens"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Fparen]
 Category=1
 Description="<html>Add or remove space inside function '(' and ')'.</html>"
 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"
 ChoicesReadable="Ignore Sp Inside Fparen|Add Sp Inside Fparen|Remove Sp Inside Fparen|Force Sp Inside Fparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Tparen]
 Category=1
-Description="<html>Add or remove space inside the first parentheses in a function type, as in<br/>'void (*x)(...)'.</html>"
+Description="<html>Add or remove space inside the first parens in the function type: 'void (*x)(...)'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_tparen=ignore|sp_inside_tparen=add|sp_inside_tparen=remove|sp_inside_tparen=force
+Choices="sp_inside_tparen=ignore|sp_inside_tparen=add|sp_inside_tparen=remove|sp_inside_tparen=force"
 ChoicesReadable="Ignore Sp Inside Tparen|Add Sp Inside Tparen|Remove Sp Inside Tparen|Force Sp Inside Tparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Tparen Close]
 Category=1
-Description="<html>Add or remove space between the ')' and '(' in a function type, as in<br/>'void (*x)(...)'.</html>"
+Description="<html>Add or remove between the parens in the function type: 'void (*x)(...)'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_tparen_close=ignore|sp_after_tparen_close=add|sp_after_tparen_close=remove|sp_after_tparen_close=force
+Choices="sp_after_tparen_close=ignore|sp_after_tparen_close=add|sp_after_tparen_close=remove|sp_after_tparen_close=force"
 ChoicesReadable="Ignore Sp After Tparen Close|Add Sp After Tparen Close|Remove Sp After Tparen Close|Force Sp After Tparen Close"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Square Fparen]
 Category=1
 Description="<html>Add or remove space between ']' and '(' when part of a function call.</html>"
 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"
 ChoicesReadable="Ignore Sp Square Fparen|Add Sp Square Fparen|Remove Sp Square Fparen|Force Sp Square Fparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Fparen Brace]
 Category=1
 Description="<html>Add or remove space between ')' and '{' of function.</html>"
 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"
 ChoicesReadable="Ignore Sp Fparen Brace|Add Sp Fparen Brace|Remove Sp Fparen Brace|Force Sp Fparen Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Fparen Brace Initializer]
 Category=1
-Description="<html>Add or remove space between ')' and '{' of s function call in object<br/>initialization.<br/><br/>Overrides sp_fparen_brace.</html>"
+Description="<html>Add or remove space between ')' and '{' of function call in object initialization. Overrides sp_fparen_brace.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_fparen_brace_initializer=ignore|sp_fparen_brace_initializer=add|sp_fparen_brace_initializer=remove|sp_fparen_brace_initializer=force
+Choices="sp_fparen_brace_initializer=ignore|sp_fparen_brace_initializer=add|sp_fparen_brace_initializer=remove|sp_fparen_brace_initializer=force"
 ChoicesReadable="Ignore Sp Fparen Brace Initializer|Add Sp Fparen Brace Initializer|Remove Sp Fparen Brace Initializer|Force Sp Fparen Brace Initializer"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Fparen Dbrace]
 Category=1
-Description="<html>(Java) Add or remove space between ')' and '{{' of double brace initializer.</html>"
+Description="<html>Java: Add or remove space between ')' and '{{' of double brace initializer.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_fparen_dbrace=ignore|sp_fparen_dbrace=add|sp_fparen_dbrace=remove|sp_fparen_dbrace=force
+Choices="sp_fparen_dbrace=ignore|sp_fparen_dbrace=add|sp_fparen_dbrace=remove|sp_fparen_dbrace=force"
 ChoicesReadable="Ignore Sp Fparen Dbrace|Add Sp Fparen Dbrace|Remove Sp Fparen Dbrace|Force Sp Fparen Dbrace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Call Paren]
 Category=1
 Description="<html>Add or remove space between function name and '(' on function calls.</html>"
 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"
 ChoicesReadable="Ignore Sp Func Call Paren|Add Sp Func Call Paren|Remove Sp Func Call Paren|Force Sp Func Call Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Call Paren Empty]
 Category=1
-Description="<html>Add or remove space between function name and '()' on function calls without<br/>parameters. If set to 'ignore' (the default), sp_func_call_paren is used.</html>"
+Description="<html>Add or remove space between function name and '()' on function calls without parameters.<BR>If set to 'ignore' (the default), sp_func_call_paren is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_call_paren_empty=ignore|sp_func_call_paren_empty=add|sp_func_call_paren_empty=remove|sp_func_call_paren_empty=force
+Choices="sp_func_call_paren_empty=ignore|sp_func_call_paren_empty=add|sp_func_call_paren_empty=remove|sp_func_call_paren_empty=force"
 ChoicesReadable="Ignore Sp Func Call Paren Empty|Add Sp Func Call Paren Empty|Remove Sp Func Call Paren Empty|Force Sp Func Call Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Call User Paren]
 Category=1
-Description="<html>Add or remove space between the user function name and '(' on function<br/>calls. You need to set a keyword to be a user function in the config file,<br/>like:<br/>  set func_call_user tr _ i18n</html>"
+Description="<html>Add or remove space between the user function name and '(' on function calls<BR>You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_call_user_paren=ignore|sp_func_call_user_paren=add|sp_func_call_user_paren=remove|sp_func_call_user_paren=force
+Choices="sp_func_call_user_paren=ignore|sp_func_call_user_paren=add|sp_func_call_user_paren=remove|sp_func_call_user_paren=force"
 ChoicesReadable="Ignore Sp Func Call User Paren|Add Sp Func Call User Paren|Remove Sp Func Call User Paren|Force Sp Func Call User Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Call User Inside Fparen]
 Category=1
-Description="<html>Add or remove space inside user function '(' and ')'.</html>"
+Description="<html>Add or remove space inside user function '(' and ')'<BR>You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_call_user_inside_fparen=ignore|sp_func_call_user_inside_fparen=add|sp_func_call_user_inside_fparen=remove|sp_func_call_user_inside_fparen=force
+Choices="sp_func_call_user_inside_fparen=ignore|sp_func_call_user_inside_fparen=add|sp_func_call_user_inside_fparen=remove|sp_func_call_user_inside_fparen=force"
 ChoicesReadable="Ignore Sp Func Call User Inside Fparen|Add Sp Func Call User Inside Fparen|Remove Sp Func Call User Inside Fparen|Force Sp Func Call User Inside Fparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Call User Paren Paren]
 Category=1
-Description="<html>Add or remove space between nested parentheses with user functions,<br/>i.e. '((' vs. '( ('.</html>"
+Description="<html>Add or remove space between nested parens with user functions: '((' vs ') )'You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_call_user_paren_paren=ignore|sp_func_call_user_paren_paren=add|sp_func_call_user_paren_paren=remove|sp_func_call_user_paren_paren=force
+Choices="sp_func_call_user_paren_paren=ignore|sp_func_call_user_paren_paren=add|sp_func_call_user_paren_paren=remove|sp_func_call_user_paren_paren=force"
 ChoicesReadable="Ignore Sp Func Call User Paren Paren|Add Sp Func Call User Paren Paren|Remove Sp Func Call User Paren Paren|Force Sp Func Call User Paren Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Class Paren]
 Category=1
-Description="<html>Add or remove space between a constructor/destructor and the open<br/>parenthesis.</html>"
+Description="<html>Add or remove space between a constructor/destructor and the open paren.</html>"
 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"
 ChoicesReadable="Ignore Sp Func Class Paren|Add Sp Func Class Paren|Remove Sp Func Class Paren|Force Sp Func Class Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Func Class Paren Empty]
 Category=1
-Description="<html>Add or remove space between a constructor without parameters or destructor<br/>and '()'.</html>"
+Description="<html>Add or remove space between a constructor without parameters or destructor and '()'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_class_paren_empty=ignore|sp_func_class_paren_empty=add|sp_func_class_paren_empty=remove|sp_func_class_paren_empty=force
+Choices="sp_func_class_paren_empty=ignore|sp_func_class_paren_empty=add|sp_func_class_paren_empty=remove|sp_func_class_paren_empty=force"
 ChoicesReadable="Ignore Sp Func Class Paren Empty|Add Sp Func Class Paren Empty|Remove Sp Func Class Paren Empty|Force Sp Func Class Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Return Paren]
 Category=1
 Description="<html>Add or remove space between 'return' and '('.</html>"
 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"
 ChoicesReadable="Ignore Sp Return Paren|Add Sp Return Paren|Remove Sp Return Paren|Force Sp Return Paren"
-ValueDefault=ignore
-
-[Sp Return Brace]
-Category=1
-Description="<html>Add or remove space between 'return' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_return_brace=ignore|sp_return_brace=add|sp_return_brace=remove|sp_return_brace=force
-ChoicesReadable="Ignore Sp Return Brace|Add Sp Return Brace|Remove Sp Return Brace|Force Sp Return Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Attribute Paren]
 Category=1
 Description="<html>Add or remove space between '__attribute__' and '('.</html>"
 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"
 ChoicesReadable="Ignore Sp Attribute Paren|Add Sp Attribute Paren|Remove Sp Attribute Paren|Force Sp Attribute Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Defined Paren]
 Category=1
 Description="<html>Add or remove space between 'defined' and '(' in '#if defined (FOO)'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_defined_paren=ignore|sp_defined_paren=add|sp_defined_paren=remove|sp_defined_paren=force
+Choices="sp_defined_paren=ignore|sp_defined_paren=add|sp_defined_paren=remove|sp_defined_paren=force"
 ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Throw Paren]
 Category=1
 Description="<html>Add or remove space between 'throw' and '(' in 'throw (something)'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_throw_paren=ignore|sp_throw_paren=add|sp_throw_paren=remove|sp_throw_paren=force
+Choices="sp_throw_paren=ignore|sp_throw_paren=add|sp_throw_paren=remove|sp_throw_paren=force"
 ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Throw]
 Category=1
-Description="<html>Add or remove space between 'throw' and anything other than '(' as in<br/>'@throw [...];'.</html>"
+Description="<html>Add or remove space between 'throw' and anything other than '(' as in '@throw [...];'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_throw=ignore|sp_after_throw=add|sp_after_throw=remove|sp_after_throw=force
+Choices="sp_after_throw=ignore|sp_after_throw=add|sp_after_throw=remove|sp_after_throw=force"
 ChoicesReadable="Ignore Sp After Throw|Add Sp After Throw|Remove Sp After Throw|Force Sp After Throw"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Catch Paren]
 Category=1
-Description="<html>Add or remove space between 'catch' and '(' in 'catch (something) { }'.<br/>If set to ignore, sp_before_sparen is used.</html>"
+Description="<html>Add or remove space between 'catch' and '(' in 'catch (something) { }'<BR>If set to ignore, sp_before_sparen is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_catch_paren=ignore|sp_catch_paren=add|sp_catch_paren=remove|sp_catch_paren=force
+Choices="sp_catch_paren=ignore|sp_catch_paren=add|sp_catch_paren=remove|sp_catch_paren=force"
 ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Oc Catch Paren]
 Category=1
-Description="<html>(OC) Add or remove space between '@catch' and '('<br/>in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.</html>"
+Description="<html>Add or remove space between '@catch' and '(' in '@catch (something) { }'<BR>If set to ignore, sp_catch_paren is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_oc_catch_paren=ignore|sp_oc_catch_paren=add|sp_oc_catch_paren=remove|sp_oc_catch_paren=force
+Choices="sp_oc_catch_paren=ignore|sp_oc_catch_paren=add|sp_oc_catch_paren=remove|sp_oc_catch_paren=force"
 ChoicesReadable="Ignore Sp Oc Catch Paren|Add Sp Oc Catch Paren|Remove Sp Oc Catch Paren|Force Sp Oc Catch Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Version Paren]
 Category=1
-Description="<html>(D) Add or remove space between 'version' and '('<br/>in 'version (something) { }'. If set to ignore, sp_before_sparen is used.</html>"
+Description="<html>Add or remove space between 'version' and '(' in 'version (something) { }' (D language)<BR>If set to ignore, sp_before_sparen is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_version_paren=ignore|sp_version_paren=add|sp_version_paren=remove|sp_version_paren=force
+Choices="sp_version_paren=ignore|sp_version_paren=add|sp_version_paren=remove|sp_version_paren=force"
 ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Scope Paren]
 Category=1
-Description="<html>(D) Add or remove space between 'scope' and '('<br/>in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.</html>"
+Description="<html>Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language)<BR>If set to ignore, sp_before_sparen is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_scope_paren=ignore|sp_scope_paren=add|sp_scope_paren=remove|sp_scope_paren=force
+Choices="sp_scope_paren=ignore|sp_scope_paren=add|sp_scope_paren=remove|sp_scope_paren=force"
 ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Super Paren]
 Category=1
-Description="<html>Add or remove space between 'super' and '(' in 'super (something)'.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space between 'super' and '(' in 'super (something)'. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_super_paren=ignore|sp_super_paren=add|sp_super_paren=remove|sp_super_paren=force
+Choices="sp_super_paren=ignore|sp_super_paren=add|sp_super_paren=remove|sp_super_paren=force"
 ChoicesReadable="Ignore Sp Super Paren|Add Sp Super Paren|Remove Sp Super Paren|Force Sp Super Paren"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp This Paren]
 Category=1
-Description="<html>Add or remove space between 'this' and '(' in 'this (something)'.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space between 'this' and '(' in 'this (something)'. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_this_paren=ignore|sp_this_paren=add|sp_this_paren=remove|sp_this_paren=force
+Choices="sp_this_paren=ignore|sp_this_paren=add|sp_this_paren=remove|sp_this_paren=force"
 ChoicesReadable="Ignore Sp This Paren|Add Sp This Paren|Remove Sp This Paren|Force Sp This Paren"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Macro]
 Category=1
-Description="<html>Add or remove space between a macro name and its definition.</html>"
+Description="<html>Add or remove space between macro and value.</html>"
 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"
 ChoicesReadable="Ignore Sp Macro|Add Sp Macro|Remove Sp Macro|Force Sp Macro"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Macro Func]
 Category=1
-Description="<html>Add or remove space between a macro function ')' and its definition.</html>"
+Description="<html>Add or remove space between macro function ')' and value.</html>"
 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"
 ChoicesReadable="Ignore Sp Macro Func|Add Sp Macro Func|Remove Sp Macro Func|Force Sp Macro Func"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Else Brace]
 Category=1
 Description="<html>Add or remove space between 'else' and '{' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Else Brace|Add Sp Else Brace|Remove Sp Else Brace|Force Sp Else Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Brace Else]
 Category=1
 Description="<html>Add or remove space between '}' and 'else' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Brace Else|Add Sp Brace Else|Remove Sp Brace Else|Force Sp Brace Else"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Brace Typedef]
 Category=1
 Description="<html>Add or remove space between '}' and the name of a typedef on the same line.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_brace_typedef=ignore|sp_brace_typedef=add|sp_brace_typedef=remove|sp_brace_typedef=force
+Choices="sp_brace_typedef=ignore|sp_brace_typedef=add|sp_brace_typedef=remove|sp_brace_typedef=force"
 ChoicesReadable="Ignore Sp Brace Typedef|Add Sp Brace Typedef|Remove Sp Brace Typedef|Force Sp Brace Typedef"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Catch Brace]
 Category=1
-Description="<html>Add or remove space before the '{' of a 'catch' statement, if the '{' and<br/>'catch' are on the same line, as in 'catch (decl) &lt;here&gt; {'.</html>"
+Description="<html>Add or remove space between 'catch' and '{' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Catch Brace|Add Sp Catch Brace|Remove Sp Catch Brace|Force Sp Catch Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Oc Catch Brace]
 Category=1
-Description="<html>(OC) Add or remove space before the '{' of a '@catch' statement, if the '{'<br/>and '@catch' are on the same line, as in '@catch (decl) &lt;here&gt; {'.<br/>If set to ignore, sp_catch_brace is used.</html>"
+Description="<html>Add or remove space between '@catch' and '{' if on the same line.<BR>If set to ignore, sp_catch_brace is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_oc_catch_brace=ignore|sp_oc_catch_brace=add|sp_oc_catch_brace=remove|sp_oc_catch_brace=force
+Choices="sp_oc_catch_brace=ignore|sp_oc_catch_brace=add|sp_oc_catch_brace=remove|sp_oc_catch_brace=force"
 ChoicesReadable="Ignore Sp Oc Catch Brace|Add Sp Oc Catch Brace|Remove Sp Oc Catch Brace|Force Sp Oc Catch Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Brace Catch]
 Category=1
 Description="<html>Add or remove space between '}' and 'catch' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Brace Catch|Add Sp Brace Catch|Remove Sp Brace Catch|Force Sp Brace Catch"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Oc Brace Catch]
 Category=1
-Description="<html>(OC) Add or remove space between '}' and '@catch' if on the same line.<br/>If set to ignore, sp_brace_catch is used.</html>"
+Description="<html>Add or remove space between '}' and '@catch' if on the same line.<BR>If set to ignore, sp_brace_catch is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_oc_brace_catch=ignore|sp_oc_brace_catch=add|sp_oc_brace_catch=remove|sp_oc_brace_catch=force
+Choices="sp_oc_brace_catch=ignore|sp_oc_brace_catch=add|sp_oc_brace_catch=remove|sp_oc_brace_catch=force"
 ChoicesReadable="Ignore Sp Oc Brace Catch|Add Sp Oc Brace Catch|Remove Sp Oc Brace Catch|Force Sp Oc Brace Catch"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Finally Brace]
 Category=1
 Description="<html>Add or remove space between 'finally' and '{' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Finally Brace|Add Sp Finally Brace|Remove Sp Finally Brace|Force Sp Finally Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Brace Finally]
 Category=1
 Description="<html>Add or remove space between '}' and 'finally' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Brace Finally|Add Sp Brace Finally|Remove Sp Brace Finally|Force Sp Brace Finally"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Try Brace]
 Category=1
 Description="<html>Add or remove space between 'try' and '{' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Try Brace|Add Sp Try Brace|Remove Sp Try Brace|Force Sp Try Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Getset Brace]
 Category=1
 Description="<html>Add or remove space between get/set and '{' if on the same line.</html>"
 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"
 ChoicesReadable="Ignore Sp Getset Brace|Add Sp Getset Brace|Remove Sp Getset Brace|Force Sp Getset Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Word Brace]
 Category=1
-Description="<html>Add or remove space between a variable and '{' for C++ uniform<br/>initialization.<br/><br/>Default: add</html>"
+Description="<html>Add or remove space between a variable and '{' for C++ uniform initialization. Default=Add.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_word_brace=ignore|sp_word_brace=add|sp_word_brace=remove|sp_word_brace=force
+Choices="sp_word_brace=ignore|sp_word_brace=add|sp_word_brace=remove|sp_word_brace=force"
 ChoicesReadable="Ignore Sp Word Brace|Add Sp Word Brace|Remove Sp Word Brace|Force Sp Word Brace"
-ValueDefault=add
+ValueDefault=1
 
 [Sp Word Brace Ns]
 Category=1
-Description="<html>Add or remove space between a variable and '{' for a namespace.<br/><br/>Default: add</html>"
+Description="<html>Add or remove space between a variable and '{' for a namespace. Default=Add.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_word_brace_ns=ignore|sp_word_brace_ns=add|sp_word_brace_ns=remove|sp_word_brace_ns=force
+Choices="sp_word_brace_ns=ignore|sp_word_brace_ns=add|sp_word_brace_ns=remove|sp_word_brace_ns=force"
 ChoicesReadable="Ignore Sp Word Brace Ns|Add Sp Word Brace Ns|Remove Sp Word Brace Ns|Force Sp Word Brace Ns"
-ValueDefault=add
+ValueDefault=1
 
 [Sp Before Dc]
 Category=1
 Description="<html>Add or remove space before the '::' operator.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Dc|Add Sp Before Dc|Remove Sp Before Dc|Force Sp Before Dc"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Dc]
 Category=1
 Description="<html>Add or remove space after the '::' operator.</html>"
 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"
 ChoicesReadable="Ignore Sp After Dc|Add Sp After Dc|Remove Sp After Dc|Force Sp After Dc"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp D Array Colon]
 Category=1
-Description="<html>(D) Add or remove around the D named array initializer ':' operator.</html>"
+Description="<html>Add or remove around the D named array initializer ':' operator.</html>"
 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"
 ChoicesReadable="Ignore Sp D Array Colon|Add Sp D Array Colon|Remove Sp D Array Colon|Force Sp D Array Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Not]
 Category=1
-Description="<html>Add or remove space after the '!' (not) unary operator.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space after the '!' (not) operator. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force
+Choices="sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force"
 ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Inv]
 Category=1
-Description="<html>Add or remove space after the '~' (invert) unary operator.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space after the '~' (invert) operator. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force
+Choices="sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force"
 ChoicesReadable="Ignore Sp Inv|Add Sp Inv|Remove Sp Inv|Force Sp Inv"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Addr]
 Category=1
-Description="<html>Add or remove space after the '&amp;' (address-of) unary operator. This does not<br/>affect the spacing after a '&amp;' that is part of a type.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space after the '&amp;' (address-of) operator. Default=Remove<BR>This does not affect the spacing after a '&amp;' that is part of a type.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force
+Choices="sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force"
 ChoicesReadable="Ignore Sp Addr|Add Sp Addr|Remove Sp Addr|Force Sp Addr"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Member]
 Category=1
-Description="<html>Add or remove space around the '.' or '-&gt;' operators.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space around the '.' or '-&gt;' operators. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force
+Choices="sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force"
 ChoicesReadable="Ignore Sp Member|Add Sp Member|Remove Sp Member|Force Sp Member"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Deref]
 Category=1
-Description="<html>Add or remove space after the '*' (dereference) unary operator. This does<br/>not affect the spacing after a '*' that is part of a type.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space after the '*' (dereference) operator. Default=Remove<BR>This does not affect the spacing after a '*' that is part of a type.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force
+Choices="sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force"
 ChoicesReadable="Ignore Sp Deref|Add Sp Deref|Remove Sp Deref|Force Sp Deref"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Sign]
 Category=1
-Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force
+Choices="sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force"
 ChoicesReadable="Ignore Sp Sign|Add Sp Sign|Remove Sp Sign|Force Sp Sign"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Incdec]
 Category=1
-Description="<html>Add or remove space between '++' and '--' the word to which it is being<br/>applied, as in '(--x)' or 'y++;'.<br/><br/>Default: remove</html>"
+Description="<html>Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force
+Choices="sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force"
 ChoicesReadable="Ignore Sp Incdec|Add Sp Incdec|Remove Sp Incdec|Force Sp Incdec"
-ValueDefault=remove
+ValueDefault=2
 
 [Sp Before Nl Cont]
 Category=1
-Description="<html>Add or remove space before a backslash-newline at the end of a line.<br/><br/>Default: add</html>"
+Description="<html>Add or remove space before a backslash-newline at the end of a line. Default=Add.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_nl_cont=ignore|sp_before_nl_cont=add|sp_before_nl_cont=remove|sp_before_nl_cont=force
+Choices="sp_before_nl_cont=ignore|sp_before_nl_cont=add|sp_before_nl_cont=remove|sp_before_nl_cont=force"
 ChoicesReadable="Ignore Sp Before Nl Cont|Add Sp Before Nl Cont|Remove Sp Before Nl Cont|Force Sp Before Nl Cont"
-ValueDefault=add
+ValueDefault=1
 
 [Sp After Oc Scope]
 Category=1
-Description="<html>(OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'<br/>or '+(int) bar;'.</html>"
+Description="<html>Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'.</html>"
 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"
 ChoicesReadable="Ignore Sp After Oc Scope|Add Sp After Oc Scope|Remove Sp After Oc Scope|Force Sp After Oc Scope"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Colon]
 Category=1
-Description="<html>(OC) Add or remove space after the colon in message specs,<br/>i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.</html>"
+Description="<html>Add or remove space after the colon in message specs<BR>'-(int) f:(int) x;' vs '-(int) f: (int) x;'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_colon=ignore|sp_after_oc_colon=add|sp_after_oc_colon=remove|sp_after_oc_colon=force
+Choices="sp_after_oc_colon=ignore|sp_after_oc_colon=add|sp_after_oc_colon=remove|sp_after_oc_colon=force"
 ChoicesReadable="Ignore Sp After Oc Colon|Add Sp After Oc Colon|Remove Sp After Oc Colon|Force Sp After Oc Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Oc Colon]
 Category=1
-Description="<html>(OC) Add or remove space before the colon in message specs,<br/>i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.</html>"
+Description="<html>Add or remove space before the colon in message specs<BR>'-(int) f: (int) x;' vs '-(int) f : (int) x;'.</html>"
 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"
 ChoicesReadable="Ignore Sp Before Oc Colon|Add Sp Before Oc Colon|Remove Sp Before Oc Colon|Force Sp Before Oc Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Dict Colon]
 Category=1
-Description="<html>(OC) Add or remove space after the colon in immutable dictionary expression<br/>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
+Description="<html>Add or remove space after the colon in immutable dictionary expression<BR>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_dict_colon=ignore|sp_after_oc_dict_colon=add|sp_after_oc_dict_colon=remove|sp_after_oc_dict_colon=force
+Choices="sp_after_oc_dict_colon=ignore|sp_after_oc_dict_colon=add|sp_after_oc_dict_colon=remove|sp_after_oc_dict_colon=force"
 ChoicesReadable="Ignore Sp After Oc Dict Colon|Add Sp After Oc Dict Colon|Remove Sp After Oc Dict Colon|Force Sp After Oc Dict Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Oc Dict Colon]
 Category=1
-Description="<html>(OC) Add or remove space before the colon in immutable dictionary expression<br/>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
+Description="<html>Add or remove space before the colon in immutable dictionary expression<BR>'NSDictionary *test = @{@"foo" :@"bar"};'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_oc_dict_colon=ignore|sp_before_oc_dict_colon=add|sp_before_oc_dict_colon=remove|sp_before_oc_dict_colon=force
+Choices="sp_before_oc_dict_colon=ignore|sp_before_oc_dict_colon=add|sp_before_oc_dict_colon=remove|sp_before_oc_dict_colon=force"
 ChoicesReadable="Ignore Sp Before Oc Dict Colon|Add Sp Before Oc Dict Colon|Remove Sp Before Oc Dict Colon|Force Sp Before Oc Dict Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Send Oc Colon]
 Category=1
-Description="<html>(OC) Add or remove space after the colon in message specs,<br/>i.e. '[object setValue:1];' vs. '[object setValue: 1];'.</html>"
+Description="<html>Add or remove space after the colon in message specs<BR>'[object setValue:1];' vs '[object setValue: 1];'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_send_oc_colon=ignore|sp_after_send_oc_colon=add|sp_after_send_oc_colon=remove|sp_after_send_oc_colon=force
+Choices="sp_after_send_oc_colon=ignore|sp_after_send_oc_colon=add|sp_after_send_oc_colon=remove|sp_after_send_oc_colon=force"
 ChoicesReadable="Ignore Sp After Send Oc Colon|Add Sp After Send Oc Colon|Remove Sp After Send Oc Colon|Force Sp After Send Oc Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Send Oc Colon]
 Category=1
-Description="<html>(OC) Add or remove space before the colon in message specs,<br/>i.e. '[object setValue:1];' vs. '[object setValue :1];'.</html>"
+Description="<html>Add or remove space before the colon in message specs<BR>'[object setValue:1];' vs '[object setValue :1];'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_send_oc_colon=ignore|sp_before_send_oc_colon=add|sp_before_send_oc_colon=remove|sp_before_send_oc_colon=force
+Choices="sp_before_send_oc_colon=ignore|sp_before_send_oc_colon=add|sp_before_send_oc_colon=remove|sp_before_send_oc_colon=force"
 ChoicesReadable="Ignore Sp Before Send Oc Colon|Add Sp Before Send Oc Colon|Remove Sp Before Send Oc Colon|Force Sp Before Send Oc Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Type]
 Category=1
-Description="<html>(OC) Add or remove space after the (type) in message specs,<br/>i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.</html>"
+Description="<html>Add or remove space after the (type) in message specs<BR>'-(int)f: (int) x;' vs '-(int)f: (int)x;'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force
+Choices="sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force"
 ChoicesReadable="Ignore Sp After Oc Type|Add Sp After Oc Type|Remove Sp After Oc Type|Force Sp After Oc Type"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Return Type]
 Category=1
-Description="<html>(OC) Add or remove space after the first (type) in message specs,<br/>i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.</html>"
+Description="<html>Add or remove space after the first (type) in message specs<BR>'-(int) f:(int)x;' vs '-(int)f:(int)x;'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_return_type=ignore|sp_after_oc_return_type=add|sp_after_oc_return_type=remove|sp_after_oc_return_type=force
+Choices="sp_after_oc_return_type=ignore|sp_after_oc_return_type=add|sp_after_oc_return_type=remove|sp_after_oc_return_type=force"
 ChoicesReadable="Ignore Sp After Oc Return Type|Add Sp After Oc Return Type|Remove Sp After Oc Return Type|Force Sp After Oc Return Type"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc At Sel]
 Category=1
-Description="<html>(OC) Add or remove space between '@selector' and '(',<br/>i.e. '@selector(msgName)' vs. '@selector (msgName)'.<br/>Also applies to '@protocol()' constructs.</html>"
+Description="<html>Add or remove space between '@selector' and '('<BR>'@selector(msgName)' vs '@selector (msgName)'<BR>Also applies to @protocol() constructs.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_at_sel=ignore|sp_after_oc_at_sel=add|sp_after_oc_at_sel=remove|sp_after_oc_at_sel=force
+Choices="sp_after_oc_at_sel=ignore|sp_after_oc_at_sel=add|sp_after_oc_at_sel=remove|sp_after_oc_at_sel=force"
 ChoicesReadable="Ignore Sp After Oc At Sel|Add Sp After Oc At Sel|Remove Sp After Oc At Sel|Force Sp After Oc At Sel"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc At Sel Parens]
 Category=1
-Description="<html>(OC) Add or remove space between '@selector(x)' and the following word,<br/>i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.</html>"
+Description="<html>Add or remove space between '@selector(x)' and the following word<BR>'@selector(foo) a:' vs '@selector(foo)a:'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_at_sel_parens=ignore|sp_after_oc_at_sel_parens=add|sp_after_oc_at_sel_parens=remove|sp_after_oc_at_sel_parens=force
+Choices="sp_after_oc_at_sel_parens=ignore|sp_after_oc_at_sel_parens=add|sp_after_oc_at_sel_parens=remove|sp_after_oc_at_sel_parens=force"
 ChoicesReadable="Ignore Sp After Oc At Sel Parens|Add Sp After Oc At Sel Parens|Remove Sp After Oc At Sel Parens|Force Sp After Oc At Sel Parens"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Oc At Sel Parens]
 Category=1
-Description="<html>(OC) Add or remove space inside '@selector' parentheses,<br/>i.e. '@selector(foo)' vs. '@selector( foo )'.<br/>Also applies to '@protocol()' constructs.</html>"
+Description="<html>Add or remove space inside '@selector' parens<BR>'@selector(foo)' vs '@selector( foo )'<BR>Also applies to @protocol() constructs.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_oc_at_sel_parens=ignore|sp_inside_oc_at_sel_parens=add|sp_inside_oc_at_sel_parens=remove|sp_inside_oc_at_sel_parens=force
+Choices="sp_inside_oc_at_sel_parens=ignore|sp_inside_oc_at_sel_parens=add|sp_inside_oc_at_sel_parens=remove|sp_inside_oc_at_sel_parens=force"
 ChoicesReadable="Ignore Sp Inside Oc At Sel Parens|Add Sp Inside Oc At Sel Parens|Remove Sp Inside Oc At Sel Parens|Force Sp Inside Oc At Sel Parens"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Oc Block Caret]
 Category=1
-Description="<html>(OC) Add or remove space before a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.</html>"
+Description="<html>Add or remove space before a block pointer caret<BR>'^int (int arg){...}' vs. ' ^int (int arg){...}'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_oc_block_caret=ignore|sp_before_oc_block_caret=add|sp_before_oc_block_caret=remove|sp_before_oc_block_caret=force
+Choices="sp_before_oc_block_caret=ignore|sp_before_oc_block_caret=add|sp_before_oc_block_caret=remove|sp_before_oc_block_caret=force"
 ChoicesReadable="Ignore Sp Before Oc Block Caret|Add Sp Before Oc Block Caret|Remove Sp Before Oc Block Caret|Force Sp Before Oc Block Caret"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Block Caret]
 Category=1
-Description="<html>(OC) Add or remove space after a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.</html>"
+Description="<html>Add or remove space after a block pointer caret<BR>'^int (int arg){...}' vs. '^ int (int arg){...}'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_block_caret=ignore|sp_after_oc_block_caret=add|sp_after_oc_block_caret=remove|sp_after_oc_block_caret=force
+Choices="sp_after_oc_block_caret=ignore|sp_after_oc_block_caret=add|sp_after_oc_block_caret=remove|sp_after_oc_block_caret=force"
 ChoicesReadable="Ignore Sp After Oc Block Caret|Add Sp After Oc Block Caret|Remove Sp After Oc Block Caret|Force Sp After Oc Block Caret"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Msg Receiver]
 Category=1
-Description="<html>(OC) Add or remove space between the receiver and selector in a message,<br/>as in '[receiver selector ...]'.</html>"
+Description="<html>Add or remove space between the receiver and selector in a message.<BR>'[receiver selector ...]'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_msg_receiver=ignore|sp_after_oc_msg_receiver=add|sp_after_oc_msg_receiver=remove|sp_after_oc_msg_receiver=force
+Choices="sp_after_oc_msg_receiver=ignore|sp_after_oc_msg_receiver=add|sp_after_oc_msg_receiver=remove|sp_after_oc_msg_receiver=force"
 ChoicesReadable="Ignore Sp After Oc Msg Receiver|Add Sp After Oc Msg Receiver|Remove Sp After Oc Msg Receiver|Force Sp After Oc Msg Receiver"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Property]
 Category=1
-Description="<html>(OC) Add or remove space after '@property'.</html>"
+Description="<html>Add or remove space after @property.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_property=ignore|sp_after_oc_property=add|sp_after_oc_property=remove|sp_after_oc_property=force
+Choices="sp_after_oc_property=ignore|sp_after_oc_property=add|sp_after_oc_property=remove|sp_after_oc_property=force"
 ChoicesReadable="Ignore Sp After Oc Property|Add Sp After Oc Property|Remove Sp After Oc Property|Force Sp After Oc Property"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Oc Synchronized]
 Category=1
-Description="<html>(OC) Add or remove space between '@synchronized' and the open parenthesis,<br/>i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.</html>"
+Description="<html>Add or remove space between '@synchronized' and the parenthesis<BR>'@synchronized(foo)' vs '@synchronized (foo)'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_oc_synchronized=ignore|sp_after_oc_synchronized=add|sp_after_oc_synchronized=remove|sp_after_oc_synchronized=force
+Choices="sp_after_oc_synchronized=ignore|sp_after_oc_synchronized=add|sp_after_oc_synchronized=remove|sp_after_oc_synchronized=force"
 ChoicesReadable="Ignore Sp After Oc Synchronized|Add Sp After Oc Synchronized|Remove Sp After Oc Synchronized|Force Sp After Oc Synchronized"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cond Colon]
 Category=1
 Description="<html>Add or remove space around the ':' in 'b ? t : f'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cond_colon=ignore|sp_cond_colon=add|sp_cond_colon=remove|sp_cond_colon=force
+Choices="sp_cond_colon=ignore|sp_cond_colon=add|sp_cond_colon=remove|sp_cond_colon=force"
 ChoicesReadable="Ignore Sp Cond Colon|Add Sp Cond Colon|Remove Sp Cond Colon|Force Sp Cond Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cond Colon Before]
 Category=1
-Description="<html>Add or remove space before the ':' in 'b ? t : f'.<br/><br/>Overrides sp_cond_colon.</html>"
+Description="<html>Add or remove space before the ':' in 'b ? t : f'. Overrides sp_cond_colon.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cond_colon_before=ignore|sp_cond_colon_before=add|sp_cond_colon_before=remove|sp_cond_colon_before=force
+Choices="sp_cond_colon_before=ignore|sp_cond_colon_before=add|sp_cond_colon_before=remove|sp_cond_colon_before=force"
 ChoicesReadable="Ignore Sp Cond Colon Before|Add Sp Cond Colon Before|Remove Sp Cond Colon Before|Force Sp Cond Colon Before"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cond Colon After]
 Category=1
-Description="<html>Add or remove space after the ':' in 'b ? t : f'.<br/><br/>Overrides sp_cond_colon.</html>"
+Description="<html>Add or remove space after the ':' in 'b ? t : f'. Overrides sp_cond_colon.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cond_colon_after=ignore|sp_cond_colon_after=add|sp_cond_colon_after=remove|sp_cond_colon_after=force
+Choices="sp_cond_colon_after=ignore|sp_cond_colon_after=add|sp_cond_colon_after=remove|sp_cond_colon_after=force"
 ChoicesReadable="Ignore Sp Cond Colon After|Add Sp Cond Colon After|Remove Sp Cond Colon After|Force Sp Cond Colon After"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cond Question]
 Category=1
 Description="<html>Add or remove space around the '?' in 'b ? t : f'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cond_question=ignore|sp_cond_question=add|sp_cond_question=remove|sp_cond_question=force
+Choices="sp_cond_question=ignore|sp_cond_question=add|sp_cond_question=remove|sp_cond_question=force"
 ChoicesReadable="Ignore Sp Cond Question|Add Sp Cond Question|Remove Sp Cond Question|Force Sp Cond Question"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cond Question Before]
 Category=1
-Description="<html>Add or remove space before the '?' in 'b ? t : f'.<br/><br/>Overrides sp_cond_question.</html>"
+Description="<html>Add or remove space before the '?' in 'b ? t : f'. Overrides sp_cond_question.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cond_question_before=ignore|sp_cond_question_before=add|sp_cond_question_before=remove|sp_cond_question_before=force
+Choices="sp_cond_question_before=ignore|sp_cond_question_before=add|sp_cond_question_before=remove|sp_cond_question_before=force"
 ChoicesReadable="Ignore Sp Cond Question Before|Add Sp Cond Question Before|Remove Sp Cond Question Before|Force Sp Cond Question Before"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cond Question After]
 Category=1
-Description="<html>Add or remove space after the '?' in 'b ? t : f'.<br/><br/>Overrides sp_cond_question.</html>"
+Description="<html>Add or remove space after the '?' in 'b ? t : f'. Overrides sp_cond_question.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cond_question_after=ignore|sp_cond_question_after=add|sp_cond_question_after=remove|sp_cond_question_after=force
+Choices="sp_cond_question_after=ignore|sp_cond_question_after=add|sp_cond_question_after=remove|sp_cond_question_after=force"
 ChoicesReadable="Ignore Sp Cond Question After|Add Sp Cond Question After|Remove Sp Cond Question After|Force Sp Cond Question After"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cond Ternary Short]
 Category=1
-Description="<html>In the abbreviated ternary form '(a ?: b)', add or remove space between '?'<br/>and ':'.<br/><br/>Overrides all other sp_cond_* options.</html>"
+Description="<html>In the abbreviated ternary form (a ?: b), add/remove space between ? and :.'. Overrides all other sp_cond_* options.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cond_ternary_short=ignore|sp_cond_ternary_short=add|sp_cond_ternary_short=remove|sp_cond_ternary_short=force
+Choices="sp_cond_ternary_short=ignore|sp_cond_ternary_short=add|sp_cond_ternary_short=remove|sp_cond_ternary_short=force"
 ChoicesReadable="Ignore Sp Cond Ternary Short|Add Sp Cond Ternary Short|Remove Sp Cond Ternary Short|Force Sp Cond Ternary Short"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Case Label]
 Category=1
-Description="<html>Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make<br/>sense here.</html>"
+Description="<html>Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_case_label=ignore|sp_case_label=add|sp_case_label=remove|sp_case_label=force
+Choices="sp_case_label=ignore|sp_case_label=add|sp_case_label=remove|sp_case_label=force"
 ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Range]
 Category=1
-Description="<html>(D) Add or remove space around the D '..' operator.</html>"
+Description="<html>Control the space around the D '..' operator.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_range=ignore|sp_range=add|sp_range=remove|sp_range=force
+Choices="sp_range=ignore|sp_range=add|sp_range=remove|sp_range=force"
 ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After For Colon]
 Category=1
-Description="<html>Add or remove space after ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var : expr)'.</html>"
+Description="<html>Control the spacing after ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_for_colon=ignore|sp_after_for_colon=add|sp_after_for_colon=remove|sp_after_for_colon=force
+Choices="sp_after_for_colon=ignore|sp_after_for_colon=add|sp_after_for_colon=remove|sp_after_for_colon=force"
 ChoicesReadable="Ignore Sp After For Colon|Add Sp After For Colon|Remove Sp After For Colon|Force Sp After For Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before For Colon]
 Category=1
-Description="<html>Add or remove space before ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var : expr)'.</html>"
+Description="<html>Control the spacing before ':' in 'for (TYPE VAR : EXPR)'. Only JAVA.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_for_colon=ignore|sp_before_for_colon=add|sp_before_for_colon=remove|sp_before_for_colon=force
+Choices="sp_before_for_colon=ignore|sp_before_for_colon=add|sp_before_for_colon=remove|sp_before_for_colon=force"
 ChoicesReadable="Ignore Sp Before For Colon|Add Sp Before For Colon|Remove Sp Before For Colon|Force Sp Before For Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Extern Paren]
 Category=1
-Description="<html>(D) Add or remove space between 'extern' and '(' as in 'extern (C)'.</html>"
+Description="<html>Control the spacing in 'extern (C)' (D).</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_extern_paren=ignore|sp_extern_paren=add|sp_extern_paren=remove|sp_extern_paren=force
+Choices="sp_extern_paren=ignore|sp_extern_paren=add|sp_extern_paren=remove|sp_extern_paren=force"
 ChoicesReadable="Ignore Sp Extern Paren|Add Sp Extern Paren|Remove Sp Extern Paren|Force Sp Extern Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cmt Cpp Start]
 Category=1
-Description="<html>Add or remove space after the opening of a C++ comment,<br/>i.e. '// A' vs. '//A'.</html>"
+Description="<html>Control the space after the opening of a C++ comment '// A' vs '//A'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cmt_cpp_start=ignore|sp_cmt_cpp_start=add|sp_cmt_cpp_start=remove|sp_cmt_cpp_start=force
+Choices="sp_cmt_cpp_start=ignore|sp_cmt_cpp_start=add|sp_cmt_cpp_start=remove|sp_cmt_cpp_start=force"
 ChoicesReadable="Ignore Sp Cmt Cpp Start|Add Sp Cmt Cpp Start|Remove Sp Cmt Cpp Start|Force Sp Cmt Cpp Start"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Cmt Cpp Doxygen]
 Category=1
-Description="<html>If true, space is added with sp_cmt_cpp_start will be added after doxygen<br/>sequences like '///', '///&lt;', '//!' and '//!&lt;'.</html>"
+Description="<html>True: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///&lt;', '//!' and '//!&lt;'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=sp_cmt_cpp_doxygen=true|sp_cmt_cpp_doxygen=false
-ValueDefault=false
+ValueDefault=0
 
 [Sp Cmt Cpp Qttr]
 Category=1
-Description="<html>If true, space is added with sp_cmt_cpp_start will be added after Qt<br/>translator or meta-data comments like '//:', '//=', and '//~'.</html>"
+Description="<html>True: If space is added with sp_cmt_cpp_start, do it after Qt translator or meta-data comments like '//:', '//=', and '//~'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=sp_cmt_cpp_qttr=true|sp_cmt_cpp_qttr=false
-ValueDefault=false
+ValueDefault=0
 
 [Sp Endif Cmt]
 Category=1
-Description="<html>Add or remove space between #else or #endif and a trailing comment.</html>"
+Description="<html>Controls the spaces between #else or #endif and a trailing comment.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_endif_cmt=ignore|sp_endif_cmt=add|sp_endif_cmt=remove|sp_endif_cmt=force
+Choices="sp_endif_cmt=ignore|sp_endif_cmt=add|sp_endif_cmt=remove|sp_endif_cmt=force"
 ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After New]
 Category=1
-Description="<html>Add or remove space after 'new', 'delete' and 'delete[]'.</html>"
+Description="<html>Controls the spaces after 'new', 'delete' and 'delete[]'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_new=ignore|sp_after_new=add|sp_after_new=remove|sp_after_new=force
+Choices="sp_after_new=ignore|sp_after_new=add|sp_after_new=remove|sp_after_new=force"
 ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Between New Paren]
 Category=1
-Description="<html>Add or remove space between 'new' and '(' in 'new()'.</html>"
+Description="<html>Controls the spaces between new and '(' in 'new()'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_between_new_paren=ignore|sp_between_new_paren=add|sp_between_new_paren=remove|sp_between_new_paren=force
+Choices="sp_between_new_paren=ignore|sp_between_new_paren=add|sp_between_new_paren=remove|sp_between_new_paren=force"
 ChoicesReadable="Ignore Sp Between New Paren|Add Sp Between New Paren|Remove Sp Between New Paren|Force Sp Between New Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp After Newop Paren]
 Category=1
-Description="<html>Add or remove space between ')' and type in 'new(foo) BAR'.</html>"
+Description="<html>Controls the spaces between ')' and 'type' in 'new(foo) BAR'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_newop_paren=ignore|sp_after_newop_paren=add|sp_after_newop_paren=remove|sp_after_newop_paren=force
+Choices="sp_after_newop_paren=ignore|sp_after_newop_paren=add|sp_after_newop_paren=remove|sp_after_newop_paren=force"
 ChoicesReadable="Ignore Sp After Newop Paren|Add Sp After Newop Paren|Remove Sp After Newop Paren|Force Sp After Newop Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Newop Paren]
 Category=1
-Description="<html>Add or remove space inside parenthesis of the new operator<br/>as in 'new(foo) BAR'.</html>"
+Description="<html>Controls the spaces inside paren of the new operator: 'new(foo) BAR'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_newop_paren=ignore|sp_inside_newop_paren=add|sp_inside_newop_paren=remove|sp_inside_newop_paren=force
+Choices="sp_inside_newop_paren=ignore|sp_inside_newop_paren=add|sp_inside_newop_paren=remove|sp_inside_newop_paren=force"
 ChoicesReadable="Ignore Sp Inside Newop Paren|Add Sp Inside Newop Paren|Remove Sp Inside Newop Paren|Force Sp Inside Newop Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Newop Paren Open]
 Category=1
-Description="<html>Add or remove space after the open parenthesis of the new operator,<br/>as in 'new(foo) BAR'.<br/><br/>Overrides sp_inside_newop_paren.</html>"
+Description="<html>Controls the space after open paren of the new operator: 'new(foo) BAR'.<BR>Overrides sp_inside_newop_paren.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_newop_paren_open=ignore|sp_inside_newop_paren_open=add|sp_inside_newop_paren_open=remove|sp_inside_newop_paren_open=force
+Choices="sp_inside_newop_paren_open=ignore|sp_inside_newop_paren_open=add|sp_inside_newop_paren_open=remove|sp_inside_newop_paren_open=force"
 ChoicesReadable="Ignore Sp Inside Newop Paren Open|Add Sp Inside Newop Paren Open|Remove Sp Inside Newop Paren Open|Force Sp Inside Newop Paren Open"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Inside Newop Paren Close]
 Category=1
-Description="<html>Add or remove space before the close parenthesis of the new operator,<br/>as in 'new(foo) BAR'.<br/><br/>Overrides sp_inside_newop_paren.</html>"
+Description="<html>Controls the space before close paren of the new operator: 'new(foo) BAR'.<BR>Overrides sp_inside_newop_paren.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_newop_paren_close=ignore|sp_inside_newop_paren_close=add|sp_inside_newop_paren_close=remove|sp_inside_newop_paren_close=force
+Choices="sp_inside_newop_paren_close=ignore|sp_inside_newop_paren_close=add|sp_inside_newop_paren_close=remove|sp_inside_newop_paren_close=force"
 ChoicesReadable="Ignore Sp Inside Newop Paren Close|Add Sp Inside Newop Paren Close|Remove Sp Inside Newop Paren Close|Force Sp Inside Newop Paren Close"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Before Tr Emb Cmt]
 Category=1
-Description="<html>Add or remove space before a trailing or embedded comment.</html>"
+Description="<html>Controls the spaces before a trailing or embedded comment.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_tr_emb_cmt=ignore|sp_before_tr_emb_cmt=add|sp_before_tr_emb_cmt=remove|sp_before_tr_emb_cmt=force
+Choices="sp_before_tr_emb_cmt=ignore|sp_before_tr_emb_cmt=add|sp_before_tr_emb_cmt=remove|sp_before_tr_emb_cmt=force"
 ChoicesReadable="Ignore Sp Before Tr Emb Cmt|Add Sp Before Tr Emb Cmt|Remove Sp Before Tr Emb Cmt|Force Sp Before Tr Emb Cmt"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Num Before Tr Emb Cmt]
 Category=1
@@ -1966,41 +1894,41 @@
 
 [Sp Annotation Paren]
 Category=1
-Description="<html>(Java) Add or remove space between an annotation and the open parenthesis.</html>"
+Description="<html>Control space between a Java annotation and the open paren.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_annotation_paren=ignore|sp_annotation_paren=add|sp_annotation_paren=remove|sp_annotation_paren=force
+Choices="sp_annotation_paren=ignore|sp_annotation_paren=add|sp_annotation_paren=remove|sp_annotation_paren=force"
 ChoicesReadable="Ignore Sp Annotation Paren|Add Sp Annotation Paren|Remove Sp Annotation Paren|Force Sp Annotation Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Sp Skip Vbrace Tokens]
 Category=1
-Description="<html>If true, vbrace tokens are dropped to the previous token and skipped.</html>"
+Description="<html>If True, vbrace tokens are dropped to the previous token and skipped.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=sp_skip_vbrace_tokens=true|sp_skip_vbrace_tokens=false
-ValueDefault=false
+ValueDefault=0
 
 [Sp After Noexcept]
 Category=1
-Description="<html>Add or remove space after 'noexcept'.</html>"
+Description="<html>Controls the space after 'noexcept'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_noexcept=ignore|sp_after_noexcept=add|sp_after_noexcept=remove|sp_after_noexcept=force
+Choices="sp_after_noexcept=ignore|sp_after_noexcept=add|sp_after_noexcept=remove|sp_after_noexcept=force"
 ChoicesReadable="Ignore Sp After Noexcept|Add Sp After Noexcept|Remove Sp After Noexcept|Force Sp After Noexcept"
-ValueDefault=ignore
+ValueDefault=0
 
 [Force Tab After Define]
 Category=1
-Description="<html>If true, a &lt;TAB&gt; is inserted after #define.</html>"
+Description="<html>If True, a &lt;TAB&gt; is inserted after #define.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=force_tab_after_define=true|force_tab_after_define=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Columns]
 Category=2
-Description="<html>The number of columns to indent per level. Usually 2, 3, 4, or 8.<br/><br/>Default: 8</html>"
+Description="<html>The number of columns to indent per level.<BR>Usually 2, 3, 4, or 8. Default=8.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_columns="
@@ -2010,35 +1938,25 @@
 
 [Indent Continue]
 Category=2
-Description="<html>The continuation indent. If non-zero, this overrides the indent of '(' and<br/>'=' continuation indents. Negative values are OK; negative value is absolute<br/>and not increased for each '(' level.<br/><br/>For FreeBSD, this is set to 4.</html>"
+Description="<html>The continuation indent. If non-zero, this overrides the indent of '(' and '=' continuation indents.<BR>For FreeBSD, this is set to 4. Negative value is absolute and not increased for each '(' level.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_continue="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Continue Class Head]
-Category=2
-Description="<html>The continuation indent, only for class header line(s). If non-zero, this<br/>overrides the indent of 'class' continuation indents.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_continue_class_head="
 MinVal=0
 MaxVal=16
 ValueDefault=0
 
 [Indent Single Newlines]
 Category=2
-Description="<html>Whether to indent empty lines (i.e. lines which contain only spaces before<br/>the newline character).</html>"
+Description="<html>Indent empty lines - lines which contain only spaces before newline character</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_single_newlines=true|indent_single_newlines=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Param]
 Category=2
-Description="<html>The continuation indent for func_*_param if they are true. If non-zero, this<br/>overrides the indent.</html>"
+Description="<html>The continuation indent for func_*_param if they are true.<BR>If non-zero, this overrides the indent.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_param="
@@ -2048,7 +1966,7 @@
 
 [Indent With Tabs]
 Category=2
-Description="<html>How to use tabs when indenting code.<br/><br/>0: Spaces only<br/>1: Indent with tabs to brace level, align with spaces (default)<br/>2: Indent and align with tabs, using spaces when not on a tabstop<br/><br/>Default: 1</html>"
+Description="<html>How to use tabs when indenting code<BR>0=spaces only<BR>1=indent with tabs to brace level, align with spaces (default)<BR>2=indent and align with tabs, using spaces when not on a tabstop</html>"
 Enabled=true
 EditorType=multiple
 Choices="indent_with_tabs=0|indent_with_tabs=1|indent_with_tabs=2"
@@ -2057,11 +1975,11 @@
 
 [Indent Cmt With Tabs]
 Category=2
-Description="<html>Whether to indent comments that are not at a brace level with tabs on a<br/>tabstop. Requires indent_with_tabs=2. If false, will use spaces.</html>"
+Description="<html>Comments that are not a brace level are indented with tabs on a tabstop.<BR>Requires indent_with_tabs=2. If false, will use spaces.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_cmt_with_tabs=true|indent_cmt_with_tabs=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Align String]
 Category=2
@@ -2069,11 +1987,11 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_align_string=true|indent_align_string=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Xml String]
 Category=2
-Description="<html>The number of spaces to indent multi-line XML strings.<br/>Requires indent_align_string=true.</html>"
+Description="<html>The number of spaces to indent multi-line XML strings.<BR>Requires indent_align_string=True.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_xml_string="
@@ -2097,79 +2015,79 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_braces=true|indent_braces=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Braces No Func]
 Category=2
-Description="<html>Whether to disable indenting function braces if indent_braces=true.</html>"
+Description="<html>Disabled indenting function braces if indent_braces is True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_braces_no_func=true|indent_braces_no_func=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Braces No Class]
 Category=2
-Description="<html>Whether to disable indenting class braces if indent_braces=true.</html>"
+Description="<html>Disabled indenting class braces if indent_braces is True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_braces_no_class=true|indent_braces_no_class=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Braces No Struct]
 Category=2
-Description="<html>Whether to disable indenting struct braces if indent_braces=true.</html>"
+Description="<html>Disabled indenting struct braces if indent_braces is True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_braces_no_struct=true|indent_braces_no_struct=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Brace Parent]
 Category=2
-Description="<html>Whether to indent based on the size of the brace parent,<br/>i.e. 'if' → 3 spaces, 'for' → 4 spaces, etc.</html>"
+Description="<html>Indent based on the size of the brace parent, i.e. 'if' =&gt; 3 spaces, 'for' =&gt; 4 spaces, etc.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_brace_parent=true|indent_brace_parent=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Paren Open Brace]
 Category=2
-Description="<html>Whether to indent based on the open parenthesis instead of the open brace<br/>in '({\n'.</html>"
+Description="<html>Indent based on the paren open instead of the brace open in '({\n', default is to indent by brace.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_paren_open_brace=true|indent_paren_open_brace=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Cs Delegate Brace]
 Category=2
-Description="<html>(C#) Whether to indent the brace of a C# delegate by another level.</html>"
+Description="<html>indent a C# delegate by another level, default is to not indent by another level.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_cs_delegate_brace=true|indent_cs_delegate_brace=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Cs Delegate Body]
 Category=2
-Description="<html>(C#) Whether to indent a C# delegate (to handle delegates with no brace) by<br/>another level.</html>"
+Description="<html>indent a C# delegate(To hanndle delegates with no brace) by another level. default: false</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_cs_delegate_body=true|indent_cs_delegate_body=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Namespace]
 Category=2
-Description="<html>Whether to indent the body of a 'namespace'.</html>"
+Description="<html>Whether the 'namespace' body is indented.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_namespace=true|indent_namespace=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Namespace Single Indent]
 Category=2
-Description="<html>Whether to indent only the first namespace, and not any nested namespaces.<br/>Requires indent_namespace=true.</html>"
+Description="<html>Only indent one namespace and no sub-namespaces.<BR>Requires indent_namespace=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_namespace_single_indent=true|indent_namespace_single_indent=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Namespace Level]
 Category=2
@@ -2183,7 +2101,7 @@
 
 [Indent Namespace Limit]
 Category=2
-Description="<html>If the body of the namespace is longer than this number, it won't be<br/>indented. Requires indent_namespace=true. 0 means no limit.</html>"
+Description="<html>If the body of the namespace is longer than this number, it won't be indented.<BR>Requires indent_namespace=True. Default=0 (no limit)</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_namespace_limit="
@@ -2197,7 +2115,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_extern=true|indent_extern=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Class]
 Category=2
@@ -2205,7 +2123,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_class=true|indent_class=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Class Colon]
 Category=2
@@ -2213,15 +2131,15 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_class_colon=true|indent_class_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Class On Colon]
 Category=2
-Description="<html>Whether to indent based on a class colon instead of the stuff after the<br/>colon. Requires indent_class_colon=true.</html>"
+Description="<html>Indent based on a class colon instead of the stuff after the colon.<BR>Requires indent_class_colon=True. Default=False.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Constr Colon]
 Category=2
@@ -2229,11 +2147,11 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_constr_colon=true|indent_constr_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Ctor Init Leading]
 Category=2
-Description="<html>Virtual indent from the ':' for member initializers.<br/><br/>Default: 2</html>"
+Description="<html>Virtual indent from the ':' for member initializers. Default=2.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_ctor_init_leading="
@@ -2243,79 +2161,79 @@
 
 [Indent Ctor Init]
 Category=2
-Description="<html>Additional indent for constructor initializer list.<br/>Negative values decrease indent down to the first column.</html>"
+Description="<html>Additional indent for constructor initializer list.<BR>Negative values decrease indent down to the first column. Default=0.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_ctor_init="
-MinVal=-16
+MinVal=0
 MaxVal=16
 ValueDefault=0
 
 [Indent Else If]
 Category=2
-Description="<html>Whether to indent 'if' following 'else' as a new block under the 'else'.<br/>If false, 'else\nif' is treated as 'else if' for indenting purposes.</html>"
+Description="<html>False=treat 'else\nif' as 'else if' for indenting purposes<BR>True=indent the 'if' one level.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_else_if=true|indent_else_if=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Var Def Blk]
 Category=2
-Description="<html>Amount to indent variable declarations after a open brace.<br/><br/>&lt;0: Relative<br/>≥0: Absolute</html>"
+Description="<html>Amount to indent variable declarations after a open brace. neg=relative, pos=absolute.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_var_def_blk="
-MinVal=-16
+MinVal=0
 MaxVal=16
 ValueDefault=0
 
 [Indent Var Def Cont]
 Category=2
-Description="<html>Whether to indent continued variable declarations instead of aligning.</html>"
+Description="<html>Indent continued variable declarations instead of aligning.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_var_def_cont=true|indent_var_def_cont=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Shift]
 Category=2
-Description="<html>Whether to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;') instead of<br/>aligning. Set align_left_shift=false when enabling this.</html>"
+Description="<html>Indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;') instead of aligning.<BR>Turn align_left_shift off when enabling this.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_shift=true|indent_shift=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Def Force Col1]
 Category=2
-Description="<html>Whether to force indentation of function definitions to start in column 1.</html>"
+Description="<html>True:  force indentation of function definition to start in column 1<BR>False: use the default behavior.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_func_def_force_col1=true|indent_func_def_force_col1=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Call Param]
 Category=2
-Description="<html>Whether to indent continued function call parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
+Description="<html>True:  indent continued function call parameters one indent level<BR>False: align parameters under the open paren.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_func_call_param=true|indent_func_call_param=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Def Param]
 Category=2
-Description="<html>Same as indent_func_call_param, but for function definitions.</html>"
+Description="<html>Same as indent_func_call_param, but for function defs.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_func_def_param=true|indent_func_def_param=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Proto Param]
 Category=2
-Description="<html>Same as indent_func_call_param, but for function prototypes.</html>"
+Description="<html>Same as indent_func_call_param, but for function protos.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_func_proto_param=true|indent_func_proto_param=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Class Param]
 Category=2
@@ -2323,7 +2241,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_func_class_param=true|indent_func_class_param=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Ctor Var Param]
 Category=2
@@ -2331,47 +2249,47 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_func_ctor_var_param=true|indent_func_ctor_var_param=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Template Param]
 Category=2
-Description="<html>Same as indent_func_call_param, but for template parameter lists.</html>"
+Description="<html>Same as indent_func_call_param, but for templates.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_template_param=true|indent_template_param=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Param Double]
 Category=2
-Description="<html>Double the indent for indent_func_xxx_param options.<br/>Use both values of the options indent_columns and indent_param.</html>"
+Description="<html>Double the indent for indent_func_xxx_param options.<BR>Use both values of the options indent_columns and indent_param.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_func_param_double=true|indent_func_param_double=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Func Const]
 Category=2
-Description="<html>Indentation column for standalone 'const' qualifier on a function<br/>prototype.</html>"
+Description="<html>Indentation column for standalone 'const' function decl/proto qualifier.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_func_const="
 MinVal=0
-MaxVal=69
+MaxVal=16
 ValueDefault=0
 
 [Indent Func Throw]
 Category=2
-Description="<html>Indentation column for standalone 'throw' qualifier on a function<br/>prototype.</html>"
+Description="<html>Indentation column for standalone 'throw' function decl/proto qualifier.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_func_throw="
 MinVal=0
-MaxVal=41
+MaxVal=16
 ValueDefault=0
 
 [Indent Member]
 Category=2
-Description="<html>The number of spaces to indent a continued '-&gt;' or '.'.<br/>Usually set to 0, 1, or 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>"
 Enabled=false
 EditorType=numeric
 CallName="indent_member="
@@ -2381,11 +2299,11 @@
 
 [Indent Member Single]
 Category=2
-Description="<html>Whether lines broken at '.' or '-&gt;' should be indented by a single indent.<br/>The indent_member option will not be effective if this is set to true.</html>"
+Description="<html>setting to true will indent lines broken at '.' or '-&gt;' by a single indent<BR>UO_indent_member option will not be effective if this is set to true.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_member_single=true|indent_member_single=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Sing Line Comments]
 Category=2
@@ -2399,15 +2317,15 @@
 
 [Indent Relative Single Line Comments]
 Category=2
-Description="<html>Whether to indent trailing single line ('//') comments relative to the code<br/>instead of trying to keep the same absolute column.</html>"
+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>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_relative_single_line_comments=true|indent_relative_single_line_comments=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Switch Case]
 Category=2
-Description="<html>Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.</html>"
+Description="<html>Spaces to indent 'case' from 'switch'<BR>Usually 0 or indent_columns.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_switch_case="
@@ -2417,15 +2335,15 @@
 
 [Indent Switch Pp]
 Category=2
-Description="<html>Whether to indent preprocessor statements inside of switch statements.<br/><br/>Default: true</html>"
+Description="<html>Whether to indent preprocessor statements inside of switch statements.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_switch_pp=true|indent_switch_pp=false
-ValueDefault=true
+ValueDefault=1
 
 [Indent Case Shift]
 Category=2
-Description="<html>Spaces to shift the 'case' line, without affecting any other lines.<br/>Usually 0.</html>"
+Description="<html>Spaces to shift the 'case' line, without affecting any other lines<BR>Usually 0.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_case_shift="
@@ -2435,11 +2353,11 @@
 
 [Indent Case Brace]
 Category=2
-Description="<html>Spaces to indent '{' from 'case'. By default, the brace will appear under<br/>the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.</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.<BR>negative value are OK.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_case_brace="
-MinVal=-16
+MinVal=0
 MaxVal=16
 ValueDefault=0
 
@@ -2449,11 +2367,11 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_col1_comment=true|indent_col1_comment=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Label]
 Category=2
-Description="<html>How to indent goto labels.<br/><br/>&gt;0: Absolute column where 1 is the leftmost column<br/>≤0: Subtract from brace indent<br/><br/>Default: 1</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<BR>Default=1</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_label="
@@ -2463,7 +2381,7 @@
 
 [Indent Access Spec]
 Category=2
-Description="<html>Same as indent_label, but for access specifiers that are followed by a<br/>colon.<br/><br/>Default: 1</html>"
+Description="<html>Same as indent_label, but for access specifiers that are followed by a colon. Default=1</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_access_spec="
@@ -2473,23 +2391,23 @@
 
 [Indent Access Spec Body]
 Category=2
-Description="<html>Whether to indent the code after an access specifier by one level.<br/>If true, this option forces 'indent_access_spec=0'.</html>"
+Description="<html>Indent the code after an access specifier by one level.<BR>If set, this option forces 'indent_access_spec=0'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_access_spec_body=true|indent_access_spec_body=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Paren Nl]
 Category=2
-Description="<html>If an open parenthesis is followed by a newline, whether to indent the next<br/>line so that it lines up after the open parenthesis (not recommended).</html>"
+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>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_paren_nl=true|indent_paren_nl=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Paren Close]
 Category=2
-Description="<html>How to indent a close parenthesis after a newline.<br/><br/>0: Indent to body level (default)<br/>1: Align under the open parenthesis<br/>2: Indent to the brace level</html>"
+Description="<html>Controls the indent of a close paren after a newline.<BR>0: Indent to body level<BR>1: Align under the open paren<BR>2: Indent to the brace level</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_paren_close="
@@ -2499,111 +2417,111 @@
 
 [Indent Paren After Func Def]
 Category=2
-Description="<html>Whether to indent the open parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
+Description="<html>Controls the indent of the open paren of a function definition, if on it's own line.If True, indents the open paren</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_paren_after_func_def=true|indent_paren_after_func_def=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Paren After Func Decl]
 Category=2
-Description="<html>Whether to indent the open parenthesis of a function declaration,<br/>if the parenthesis is on its own line.</html>"
+Description="<html>Controls the indent of the open paren of a function declaration, if on it's own line.If True, indents the open paren</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_paren_after_func_decl=true|indent_paren_after_func_decl=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Paren After Func Call]
 Category=2
-Description="<html>Whether to indent the open parenthesis of a function call,<br/>if the parenthesis is on its own line.</html>"
+Description="<html>Controls the indent of the open paren of a function call, if on it's own line.If True, indents the open paren</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_paren_after_func_call=true|indent_paren_after_func_call=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Comma Paren]
 Category=2
-Description="<html>Whether to indent a comma when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
+Description="<html>Controls the indent of a comma when inside a paren.If True, aligns under the open paren.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_comma_paren=true|indent_comma_paren=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Bool Paren]
 Category=2
-Description="<html>Whether to indent a Boolean operator when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
+Description="<html>Controls the indent of a BOOL operator when inside a paren.If True, aligns under the open paren.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_bool_paren=true|indent_bool_paren=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Semicolon For Paren]
 Category=2
-Description="<html>Whether to indent a semicolon when inside a for parenthesis.<br/>If true, aligns under the open for parenthesis.</html>"
+Description="<html>Controls the indent of a semicolon when inside a for paren.If True, aligns under the open for paren.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_semicolon_for_paren=true|indent_semicolon_for_paren=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent First Bool Expr]
 Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=true.</html>"
+Description="<html>If 'indent_bool_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent First For Expr]
 Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_semicolon_for_paren=true.</html>"
+Description="<html>If 'indent_semicolon_for_paren' is True, controls the indent of the first expression. If True, aligns the first expression to the following ones.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_first_for_expr=true|indent_first_for_expr=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Square Nl]
 Category=2
-Description="<html>If an open square is followed by a newline, whether to indent the next line<br/>so that it lines up after the open square (not recommended).</html>"
+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>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_square_nl=true|indent_square_nl=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Preserve Sql]
 Category=2
-Description="<html>(ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.</html>"
+Description="<html>Don't change the relative indent of ESQL/C 'EXEC SQL' bodies.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Align Assign]
 Category=2
-Description="<html>Whether to align continued statements at the '='. If false or if the '=' is<br/>followed by a newline, the next line is indent one tab.<br/><br/>Default: true</html>"
+Description="<html>Align continued statements at the '='. Default=True<BR>If False or the '=' is followed by a newline, the next line is indent one tab.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_align_assign=true|indent_align_assign=false
-ValueDefault=true
+ValueDefault=1
 
 [Indent Align Paren]
 Category=2
-Description="<html>Whether to align continued statements at the '('. If false or the '(' is not<br/>followed by a newline, the next line indent is one tab.<br/><br/>Default: true</html>"
+Description="<html>Align continued statements at the '('. Default=True<BR>If FALSE or the '(' is not followed by a newline, the next line indent is one tab.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_align_paren=true|indent_align_paren=false
-ValueDefault=true
+ValueDefault=1
 
 [Indent Oc Block]
 Category=2
-Description="<html>(OC) Whether to indent Objective-C blocks at brace level instead of usual<br/>rules.</html>"
+Description="<html>Indent OC blocks at brace level instead of usual rules.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_oc_block=true|indent_oc_block=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Oc Block Msg]
 Category=2
-Description="<html>(OC) Indent for Objective-C blocks in a message relative to the parameter<br/>name.<br/><br/>=0: Use indent_oc_block rules<br/>&gt;0: Use specified number of spaces to indent</html>"
+Description="<html>Indent OC blocks in a message relative to the parameter name.<BR>0=use indent_oc_block rules, 1+=spaces to indent</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_oc_block_msg="
@@ -2613,7 +2531,7 @@
 
 [Indent Oc Msg Colon]
 Category=2
-Description="<html>(OC) Minimum indent for subsequent parameters</html>"
+Description="<html>Minimum indent for subsequent parameters</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_oc_msg_colon="
@@ -2623,55 +2541,55 @@
 
 [Indent Oc Msg Prioritize First Colon]
 Category=2
-Description="<html>(OC) Whether to prioritize aligning with initial colon (and stripping spaces<br/>from lines, if necessary).<br/><br/>Default: true</html>"
+Description="<html>If True, prioritize aligning with initial colon (and stripping spaces from lines, if necessary).<BR>Default=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_oc_msg_prioritize_first_colon=true|indent_oc_msg_prioritize_first_colon=false
-ValueDefault=true
+ValueDefault=1
 
 [Indent Oc Block Msg Xcode Style]
 Category=2
-Description="<html>(OC) Whether to indent blocks the way that Xcode does by default<br/>(from the keyword if the parameter is on its own line; otherwise, from the<br/>previous indentation level). Requires indent_oc_block_msg=true.</html>"
+Description="<html>If indent_oc_block_msg and this option are on, blocks will be indented the way that Xcode does by default (from keyword if the parameter is on its own line; otherwise, from the previous indentation level).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_oc_block_msg_xcode_style=true|indent_oc_block_msg_xcode_style=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Oc Block Msg From Keyword]
 Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace is, relative to a<br/>message keyword. Requires indent_oc_block_msg=true.</html>"
+Description="<html>If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg keyword.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_oc_block_msg_from_keyword=true|indent_oc_block_msg_from_keyword=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Oc Block Msg From Colon]
 Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace is, relative to a message<br/>colon. Requires indent_oc_block_msg=true.</html>"
+Description="<html>If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is relative to a msg colon.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_oc_block_msg_from_colon=true|indent_oc_block_msg_from_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Oc Block Msg From Caret]
 Category=2
-Description="<html>(OC) Whether to indent blocks from where the block caret is.<br/>Requires indent_oc_block_msg=true.</html>"
+Description="<html>If indent_oc_block_msg and this option are on, blocks will be indented from where the block caret is.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_oc_block_msg_from_caret=true|indent_oc_block_msg_from_caret=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Oc Block Msg From Brace]
 Category=2
-Description="<html>(OC) Whether to indent blocks from where the brace caret is.<br/>Requires indent_oc_block_msg=true.</html>"
+Description="<html>If indent_oc_block_msg and this option are on, blocks will be indented from where the brace is.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_oc_block_msg_from_brace=true|indent_oc_block_msg_from_brace=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Min Vbrace Open]
 Category=2
-Description="<html>When indenting after virtual brace open and newline add further spaces to<br/>reach this minimum indent.</html>"
+Description="<html>When indenting after virtual brace open and newline add further spaces to reach this min. indent.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_min_vbrace_open="
@@ -2681,39 +2599,39 @@
 
 [Indent Vbrace Open On Tabstop]
 Category=2
-Description="<html>Whether to add further spaces after regular indent to reach next tabstop<br/>when identing after virtual brace open and newline.</html>"
+Description="<html>True: When identing after virtual brace open and newline add further spaces after regular indent to reach next tabstop.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_vbrace_open_on_tabstop=true|indent_vbrace_open_on_tabstop=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Token After Brace]
 Category=2
-Description="<html>How to indent after a brace followed by another token (not a newline).<br/>true:  indent all contained lines to match the token<br/>false: indent all contained lines to match the brace<br/><br/>Default: true</html>"
+Description="<html>If True, a brace followed by another token (not a newline) will indent all contained lines to match the token.Default=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_token_after_brace=true|indent_token_after_brace=false
-ValueDefault=true
+ValueDefault=1
 
 [Indent Cpp Lambda Body]
 Category=2
-Description="<html>Whether to indent the body of a C++11 lambda.</html>"
+Description="<html>If True, cpp lambda body will be indentedDefault=False.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_cpp_lambda_body=true|indent_cpp_lambda_body=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Using Block]
 Category=2
-Description="<html>(C#) Whether to indent a 'using' block if no braces are used.<br/><br/>Default: true</html>"
+Description="<html>indent (or not) an using block if no braces are used. Only for C#.Default=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_using_block=true|indent_using_block=false
-ValueDefault=true
+ValueDefault=1
 
 [Indent Ternary Operator]
 Category=2
-Description="<html>How to indent the continuation of ternary operator.<br/><br/>0: Off (default)<br/>1: When the `if_false` is a continuation, indent it under `if_false`<br/>2: When the `:` is a continuation, indent it under `?`</html>"
+Description="<html>indent the continuation of ternary operator.<BR>0: (Default) off<BR>1: When the `if_false` is a continuation, indent it under `if_false`<BR>2: When the `:` is a continuation, indent it under `?`</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_ternary_operator="
@@ -2727,23 +2645,23 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_off_after_return_new=true|indent_off_after_return_new=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Single After Return]
 Category=2
-Description="<html>If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.</html>"
+Description="<html>If true, the tokens after return are indented with regular single indentation.By default (false) the indentation is after the return token.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_single_after_return=true|indent_single_after_return=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Ignore Asm Block]
 Category=2
-Description="<html>Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they<br/>have their own indentation).</html>"
+Description="<html>If true, ignore indent and align for asm blocks as they have their own indentation.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_ignore_asm_block=true|indent_ignore_asm_block=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Collapse Empty Body]
 Category=3
@@ -2751,31 +2669,31 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Assign Leave One Liners]
 Category=3
-Description="<html>Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.</html>"
+Description="<html>Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_assign_leave_one_liners=true|nl_assign_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Class Leave One Liners]
 Category=3
-Description="<html>Don't split one-line braced statements inside a 'class xx { }' body.</html>"
+Description="<html>Don't split one-line braced statements inside a class xx { } body.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_class_leave_one_liners=true|nl_class_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Enum Leave One Liners]
 Category=3
-Description="<html>Don't split one-line enums, as in 'enum foo { BAR = 15 };'</html>"
+Description="<html>Don't split one-line enums: 'enum foo { BAR = 15 };'</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_enum_leave_one_liners=true|nl_enum_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Getset Leave One Liners]
 Category=3
@@ -2783,112 +2701,95 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_getset_leave_one_liners=true|nl_getset_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Cs Property Leave One Liners]
 Category=3
-Description="<html>(C#) Don't split one-line property get or set functions.</html>"
+Description="<html>Don't split one-line get or set functions.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_cs_property_leave_one_liners=true|nl_cs_property_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Leave One Liners]
 Category=3
-Description="<html>Don't split one-line function definitions, as in 'int foo() { return 0; }'.</html>"
+Description="<html>Don't split one-line function definitions - 'int foo() { return 0; }'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_leave_one_liners=true|nl_func_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Cpp Lambda Leave One Liners]
 Category=3
-Description="<html>Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.</html>"
+Description="<html>Don't split one-line C++11 lambdas - '[]() { return 0; }'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_cpp_lambda_leave_one_liners=true|nl_cpp_lambda_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl If Leave One Liners]
 Category=3
-Description="<html>Don't split one-line if/else statements, as in 'if(...) b++;'.</html>"
+Description="<html>Don't split one-line if/else statements - 'if(a) b++;'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_if_leave_one_liners=true|nl_if_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl While Leave One Liners]
 Category=3
-Description="<html>Don't split one-line while statements, as in 'while(...) b++;'.</html>"
+Description="<html>Don't split one-line while statements - 'while(a) b++;'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_while_leave_one_liners=true|nl_while_leave_one_liners=false
-ValueDefault=false
-
-[Nl For Leave One Liners]
-Category=3
-Description="<html>Don't split one-line for statements, as in 'for(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_for_leave_one_liners=true|nl_for_leave_one_liners=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Oc Msg Leave One Liner]
 Category=3
-Description="<html>(OC) Don't split one-line Objective-C messages.</html>"
+Description="<html>Don't split one-line OC messages.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_oc_msg_leave_one_liner=true|nl_oc_msg_leave_one_liner=false
-ValueDefault=false
-
-[Nl Oc Mdef Brace]
-Category=3
-Description="<html>(OC) Add or remove newline between method declaration and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_mdef_brace=ignore|nl_oc_mdef_brace=add|nl_oc_mdef_brace=remove|nl_oc_mdef_brace=force
-ChoicesReadable="Ignore Nl Oc Mdef Brace|Add Nl Oc Mdef Brace|Remove Nl Oc Mdef Brace|Force Nl Oc Mdef Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Oc Block Brace]
 Category=3
-Description="<html>(OC) Add or remove newline between Objective-C block signature and '{'.</html>"
+Description="<html>Add or remove newline between Objective-C block signature and '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_block_brace=ignore|nl_oc_block_brace=add|nl_oc_block_brace=remove|nl_oc_block_brace=force
+Choices="nl_oc_block_brace=ignore|nl_oc_block_brace=add|nl_oc_block_brace=remove|nl_oc_block_brace=force"
 ChoicesReadable="Ignore Nl Oc Block Brace|Add Nl Oc Block Brace|Remove Nl Oc Block Brace|Force Nl Oc Block Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Oc Interface Brace]
 Category=3
-Description="<html>(OC) Add or remove newline between '@interface' and '{'.</html>"
+Description="<html>Add or remove newline between @interface and '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_interface_brace=ignore|nl_oc_interface_brace=add|nl_oc_interface_brace=remove|nl_oc_interface_brace=force
+Choices="nl_oc_interface_brace=ignore|nl_oc_interface_brace=add|nl_oc_interface_brace=remove|nl_oc_interface_brace=force"
 ChoicesReadable="Ignore Nl Oc Interface Brace|Add Nl Oc Interface Brace|Remove Nl Oc Interface Brace|Force Nl Oc Interface Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Oc Implementation Brace]
 Category=3
-Description="<html>(OC) Add or remove newline between '@implementation' and '{'.</html>"
+Description="<html>Add or remove newline between @implementation and '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_implementation_brace=ignore|nl_oc_implementation_brace=add|nl_oc_implementation_brace=remove|nl_oc_implementation_brace=force
+Choices="nl_oc_implementation_brace=ignore|nl_oc_implementation_brace=add|nl_oc_implementation_brace=remove|nl_oc_implementation_brace=force"
 ChoicesReadable="Ignore Nl Oc Implementation Brace|Add Nl Oc Implementation Brace|Remove Nl Oc Implementation Brace|Force Nl Oc Implementation Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Start Of File]
 Category=3
 Description="<html>Add or remove newlines at the start of the file.</html>"
 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"
 ChoicesReadable="Ignore Nl Start Of File|Add Nl Start Of File|Remove Nl Start Of File|Force Nl Start Of File"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Start Of File Min]
 Category=3
-Description="<html>The minimum number of newlines at the start of the file (only used if<br/>nl_start_of_file is 'add' or 'force').</html>"
+Description="<html>The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_start_of_file_min="
@@ -2901,13 +2802,13 @@
 Description="<html>Add or remove newline at the end of the file.</html>"
 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"
 ChoicesReadable="Ignore Nl End Of File|Add Nl End Of File|Remove Nl End Of File|Force Nl End Of File"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl End Of File Min]
 Category=3
-Description="<html>The minimum number of newlines at the end of the file (only used if<br/>nl_end_of_file is 'add' or 'force').</html>"
+Description="<html>The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force').</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_end_of_file_min="
@@ -2920,40 +2821,40 @@
 Description="<html>Add or remove newline between '=' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Assign Brace|Add Nl Assign Brace|Remove Nl Assign Brace|Force Nl Assign Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Assign Square]
 Category=3
-Description="<html>(D) Add or remove newline between '=' and '['.</html>"
+Description="<html>Add or remove newline between '=' and '[' (D only).</html>"
 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"
 ChoicesReadable="Ignore Nl Assign Square|Add Nl Assign Square|Remove Nl Assign Square|Force Nl Assign Square"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Tsquare Brace]
 Category=3
 Description="<html>Add or remove newline between '[]' and '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_tsquare_brace=ignore|nl_tsquare_brace=add|nl_tsquare_brace=remove|nl_tsquare_brace=force
+Choices="nl_tsquare_brace=ignore|nl_tsquare_brace=add|nl_tsquare_brace=remove|nl_tsquare_brace=force"
 ChoicesReadable="Ignore Nl Tsquare Brace|Add Nl Tsquare Brace|Remove Nl Tsquare Brace|Force Nl Tsquare Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After Square Assign]
 Category=3
-Description="<html>(D) Add or remove newline after '= ['. Will also affect the newline before<br/>the ']'.</html>"
+Description="<html>Add or remove newline after '= [' (D only). Will also affect the newline before the ']'.</html>"
 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"
 ChoicesReadable="Ignore Nl After Square Assign|Add Nl After Square Assign|Remove Nl After Square Assign|Force Nl After Square Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Var Def Blk]
 Category=3
-Description="<html>The number of blank lines after a block of variable definitions at the top<br/>of a function body.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of blank lines after a block of variable definitions at the top of a function body<BR>0 = No change (default).</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_func_var_def_blk="
@@ -2963,7 +2864,7 @@
 
 [Nl Typedef Blk Start]
 Category=3
-Description="<html>The number of newlines before a block of typedefs. If nl_after_access_spec<br/>is non-zero, that option takes precedence.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines before a block of typedefs<BR>0 = No change (default)<BR>is overridden by the option 'nl_after_access_spec'.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_typedef_blk_start="
@@ -2973,7 +2874,7 @@
 
 [Nl Typedef Blk End]
 Category=3
-Description="<html>The number of newlines after a block of typedefs.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines after a block of typedefs<BR>0 = No change (default).</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_typedef_blk_end="
@@ -2983,7 +2884,7 @@
 
 [Nl Typedef Blk In]
 Category=3
-Description="<html>The maximum number of consecutive newlines within a block of typedefs.<br/><br/>0 = No change (default).</html>"
+Description="<html>The maximum consecutive newlines within a block of typedefs<BR>0 = No change (default).</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_typedef_blk_in="
@@ -2993,7 +2894,7 @@
 
 [Nl Var Def Blk Start]
 Category=3
-Description="<html>The number of newlines before a block of variable definitions not at the top<br/>of a function body. If nl_after_access_spec is non-zero, that option takes<br/>precedence.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines before a block of variable definitions not at the top of a function body<BR>0 = No change (default)<BR>is overridden by the option 'nl_after_access_spec'.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_var_def_blk_start="
@@ -3003,7 +2904,7 @@
 
 [Nl Var Def Blk End]
 Category=3
-Description="<html>The number of newlines after a block of variable definitions not at the top<br/>of a function body.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines after a block of variable definitions not at the top of a function body<BR>0 = No change (default).</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_var_def_blk_end="
@@ -3013,7 +2914,7 @@
 
 [Nl Var Def Blk In]
 Category=3
-Description="<html>The maximum number of consecutive newlines within a block of variable<br/>definitions.<br/><br/>0 = No change (default).</html>"
+Description="<html>The maximum consecutive newlines within a block of variable definitions<BR>0 = No change (default).</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_var_def_blk_in="
@@ -3023,326 +2924,326 @@
 
 [Nl Fcall Brace]
 Category=3
-Description="<html>Add or remove newline between a function call's ')' and '{', as in<br/>'list_for_each(item, &amp;list) { }'.</html>"
+Description="<html>Add or remove newline between a function call's ')' and '{', as in:<BR>list_for_each(item, &amp;list) { }.</html>"
 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"
 ChoicesReadable="Ignore Nl Fcall Brace|Add Nl Fcall Brace|Remove Nl Fcall Brace|Force Nl Fcall Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Enum Brace]
 Category=3
 Description="<html>Add or remove newline between 'enum' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Enum Brace|Add Nl Enum Brace|Remove Nl Enum Brace|Force Nl Enum Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Enum Class]
 Category=3
 Description="<html>Add or remove newline between 'enum' and 'class'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_enum_class=ignore|nl_enum_class=add|nl_enum_class=remove|nl_enum_class=force
+Choices="nl_enum_class=ignore|nl_enum_class=add|nl_enum_class=remove|nl_enum_class=force"
 ChoicesReadable="Ignore Nl Enum Class|Add Nl Enum Class|Remove Nl Enum Class|Force Nl Enum Class"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Enum Class Identifier]
 Category=3
 Description="<html>Add or remove newline between 'enum class' and the identifier.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_enum_class_identifier=ignore|nl_enum_class_identifier=add|nl_enum_class_identifier=remove|nl_enum_class_identifier=force
+Choices="nl_enum_class_identifier=ignore|nl_enum_class_identifier=add|nl_enum_class_identifier=remove|nl_enum_class_identifier=force"
 ChoicesReadable="Ignore Nl Enum Class Identifier|Add Nl Enum Class Identifier|Remove Nl Enum Class Identifier|Force Nl Enum Class Identifier"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Enum Identifier Colon]
 Category=3
 Description="<html>Add or remove newline between 'enum class' type and ':'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_enum_identifier_colon=ignore|nl_enum_identifier_colon=add|nl_enum_identifier_colon=remove|nl_enum_identifier_colon=force
+Choices="nl_enum_identifier_colon=ignore|nl_enum_identifier_colon=add|nl_enum_identifier_colon=remove|nl_enum_identifier_colon=force"
 ChoicesReadable="Ignore Nl Enum Identifier Colon|Add Nl Enum Identifier Colon|Remove Nl Enum Identifier Colon|Force Nl Enum Identifier Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Enum Colon Type]
 Category=3
-Description="<html>Add or remove newline between 'enum class identifier :' and type.</html>"
+Description="<html>Add or remove newline between 'enum class identifier :' and 'type' and/or 'type'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_enum_colon_type=ignore|nl_enum_colon_type=add|nl_enum_colon_type=remove|nl_enum_colon_type=force
+Choices="nl_enum_colon_type=ignore|nl_enum_colon_type=add|nl_enum_colon_type=remove|nl_enum_colon_type=force"
 ChoicesReadable="Ignore Nl Enum Colon Type|Add Nl Enum Colon Type|Remove Nl Enum Colon Type|Force Nl Enum Colon Type"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Struct Brace]
 Category=3
 Description="<html>Add or remove newline between 'struct and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Struct Brace|Add Nl Struct Brace|Remove Nl Struct Brace|Force Nl Struct Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Union Brace]
 Category=3
 Description="<html>Add or remove newline between 'union' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Union Brace|Add Nl Union Brace|Remove Nl Union Brace|Force Nl Union Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl If Brace]
 Category=3
 Description="<html>Add or remove newline between 'if' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl If Brace|Add Nl If Brace|Remove Nl If Brace|Force Nl If Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Brace Else]
 Category=3
 Description="<html>Add or remove newline between '}' and 'else'.</html>"
 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"
 ChoicesReadable="Ignore Nl Brace Else|Add Nl Brace Else|Remove Nl Brace Else|Force Nl Brace Else"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Elseif Brace]
 Category=3
-Description="<html>Add or remove newline between 'else if' and '{'. If set to ignore,<br/>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>"
 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"
 ChoicesReadable="Ignore Nl Elseif Brace|Add Nl Elseif Brace|Remove Nl Elseif Brace|Force Nl Elseif Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Else Brace]
 Category=3
 Description="<html>Add or remove newline between 'else' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Else Brace|Add Nl Else Brace|Remove Nl Else Brace|Force Nl Else Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Else If]
 Category=3
 Description="<html>Add or remove newline between 'else' and 'if'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_else_if=ignore|nl_else_if=add|nl_else_if=remove|nl_else_if=force
+Choices="nl_else_if=ignore|nl_else_if=add|nl_else_if=remove|nl_else_if=force"
 ChoicesReadable="Ignore Nl Else If|Add Nl Else If|Remove Nl Else If|Force Nl Else If"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Before If Closing Paren]
 Category=3
 Description="<html>Add or remove newline before 'if'/'else if' closing parenthesis.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_if_closing_paren=ignore|nl_before_if_closing_paren=add|nl_before_if_closing_paren=remove|nl_before_if_closing_paren=force
+Choices="nl_before_if_closing_paren=ignore|nl_before_if_closing_paren=add|nl_before_if_closing_paren=remove|nl_before_if_closing_paren=force"
 ChoicesReadable="Ignore Nl Before If Closing Paren|Add Nl Before If Closing Paren|Remove Nl Before If Closing Paren|Force Nl Before If Closing Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Brace Finally]
 Category=3
 Description="<html>Add or remove newline between '}' and 'finally'.</html>"
 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"
 ChoicesReadable="Ignore Nl Brace Finally|Add Nl Brace Finally|Remove Nl Brace Finally|Force Nl Brace Finally"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Finally Brace]
 Category=3
 Description="<html>Add or remove newline between 'finally' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Finally Brace|Add Nl Finally Brace|Remove Nl Finally Brace|Force Nl Finally Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Try Brace]
 Category=3
 Description="<html>Add or remove newline between 'try' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Try Brace|Add Nl Try Brace|Remove Nl Try Brace|Force Nl Try Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Getset Brace]
 Category=3
 Description="<html>Add or remove newline between get/set and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Getset Brace|Add Nl Getset Brace|Remove Nl Getset Brace|Force Nl Getset Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl For Brace]
 Category=3
 Description="<html>Add or remove newline between 'for' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl For Brace|Add Nl For Brace|Remove Nl For Brace|Force Nl For Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Catch Brace]
 Category=3
-Description="<html>Add or remove newline before the '{' of a 'catch' statement, as in<br/>'catch (decl) &lt;here&gt; {'.</html>"
+Description="<html>Add or remove newline between 'catch' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Catch Brace|Add Nl Catch Brace|Remove Nl Catch Brace|Force Nl Catch Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Oc Catch Brace]
 Category=3
-Description="<html>(OC) Add or remove newline before the '{' of a '@catch' statement, as in<br/>'@catch (decl) &lt;here&gt; {'. If set to ignore, nl_catch_brace is used.</html>"
+Description="<html>Add or remove newline between '@catch' and '{'.<BR>If set to ignore, nl_catch_brace is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_catch_brace=ignore|nl_oc_catch_brace=add|nl_oc_catch_brace=remove|nl_oc_catch_brace=force
+Choices="nl_oc_catch_brace=ignore|nl_oc_catch_brace=add|nl_oc_catch_brace=remove|nl_oc_catch_brace=force"
 ChoicesReadable="Ignore Nl Oc Catch Brace|Add Nl Oc Catch Brace|Remove Nl Oc Catch Brace|Force Nl Oc Catch Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Brace Catch]
 Category=3
 Description="<html>Add or remove newline between '}' and 'catch'.</html>"
 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"
 ChoicesReadable="Ignore Nl Brace Catch|Add Nl Brace Catch|Remove Nl Brace Catch|Force Nl Brace Catch"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Oc Brace Catch]
 Category=3
-Description="<html>(OC) Add or remove newline between '}' and '@catch'. If set to ignore,<br/>nl_brace_catch is used.</html>"
+Description="<html>Add or remove newline between '}' and 'catch'.<BR>If set to ignore, nl_brace_catch is used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_brace_catch=ignore|nl_oc_brace_catch=add|nl_oc_brace_catch=remove|nl_oc_brace_catch=force
+Choices="nl_oc_brace_catch=ignore|nl_oc_brace_catch=add|nl_oc_brace_catch=remove|nl_oc_brace_catch=force"
 ChoicesReadable="Ignore Nl Oc Brace Catch|Add Nl Oc Brace Catch|Remove Nl Oc Brace Catch|Force Nl Oc Brace Catch"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Brace Square]
 Category=3
 Description="<html>Add or remove newline between '}' and ']'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_brace_square=ignore|nl_brace_square=add|nl_brace_square=remove|nl_brace_square=force
+Choices="nl_brace_square=ignore|nl_brace_square=add|nl_brace_square=remove|nl_brace_square=force"
 ChoicesReadable="Ignore Nl Brace Square|Add Nl Brace Square|Remove Nl Brace Square|Force Nl Brace Square"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Brace Fparen]
 Category=3
 Description="<html>Add or remove newline between '}' and ')' in a function invocation.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_brace_fparen=ignore|nl_brace_fparen=add|nl_brace_fparen=remove|nl_brace_fparen=force
+Choices="nl_brace_fparen=ignore|nl_brace_fparen=add|nl_brace_fparen=remove|nl_brace_fparen=force"
 ChoicesReadable="Ignore Nl Brace Fparen|Add Nl Brace Fparen|Remove Nl Brace Fparen|Force Nl Brace Fparen"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl While Brace]
 Category=3
 Description="<html>Add or remove newline between 'while' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Scope Brace]
 Category=3
-Description="<html>(D) Add or remove newline between 'scope (x)' and '{'.</html>"
+Description="<html>Add or remove newline between 'scope (x)' and '{' (D).</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_scope_brace=ignore|nl_scope_brace=add|nl_scope_brace=remove|nl_scope_brace=force
+Choices="nl_scope_brace=ignore|nl_scope_brace=add|nl_scope_brace=remove|nl_scope_brace=force"
 ChoicesReadable="Ignore Nl Scope Brace|Add Nl Scope Brace|Remove Nl Scope Brace|Force Nl Scope Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Unittest Brace]
 Category=3
-Description="<html>(D) Add or remove newline between 'unittest' and '{'.</html>"
+Description="<html>Add or remove newline between 'unittest' and '{' (D).</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_unittest_brace=ignore|nl_unittest_brace=add|nl_unittest_brace=remove|nl_unittest_brace=force
+Choices="nl_unittest_brace=ignore|nl_unittest_brace=add|nl_unittest_brace=remove|nl_unittest_brace=force"
 ChoicesReadable="Ignore Nl Unittest Brace|Add Nl Unittest Brace|Remove Nl Unittest Brace|Force Nl Unittest Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Version Brace]
 Category=3
-Description="<html>(D) Add or remove newline between 'version (x)' and '{'.</html>"
+Description="<html>Add or remove newline between 'version (x)' and '{' (D).</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_version_brace=ignore|nl_version_brace=add|nl_version_brace=remove|nl_version_brace=force
+Choices="nl_version_brace=ignore|nl_version_brace=add|nl_version_brace=remove|nl_version_brace=force"
 ChoicesReadable="Ignore Nl Version Brace|Add Nl Version Brace|Remove Nl Version Brace|Force Nl Version Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Using Brace]
 Category=3
-Description="<html>(C#) Add or remove newline between 'using' and '{'.</html>"
+Description="<html>Add or remove newline between 'using' and '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_using_brace=ignore|nl_using_brace=add|nl_using_brace=remove|nl_using_brace=force
+Choices="nl_using_brace=ignore|nl_using_brace=add|nl_using_brace=remove|nl_using_brace=force"
 ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Brace Brace]
 Category=3
-Description="<html>Add or remove newline between two open or close braces. Due to general<br/>newline/brace handling, REMOVE may not work.</html>"
+Description="<html>Add or remove newline between two open or close braces.<BR>Due to general newline/brace handling, REMOVE may not work.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_brace_brace=ignore|nl_brace_brace=add|nl_brace_brace=remove|nl_brace_brace=force
+Choices="nl_brace_brace=ignore|nl_brace_brace=add|nl_brace_brace=remove|nl_brace_brace=force"
 ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Do Brace]
 Category=3
 Description="<html>Add or remove newline between 'do' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Do Brace|Add Nl Do Brace|Remove Nl Do Brace|Force Nl Do Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Brace While]
 Category=3
 Description="<html>Add or remove newline between '}' and 'while' of 'do' statement.</html>"
 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"
 ChoicesReadable="Ignore Nl Brace While|Add Nl Brace While|Remove Nl Brace While|Force Nl Brace While"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Switch Brace]
 Category=3
 Description="<html>Add or remove newline between 'switch' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Switch Brace|Add Nl Switch Brace|Remove Nl Switch Brace|Force Nl Switch Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Synchronized Brace]
 Category=3
 Description="<html>Add or remove newline between 'synchronized' and '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_synchronized_brace=ignore|nl_synchronized_brace=add|nl_synchronized_brace=remove|nl_synchronized_brace=force
+Choices="nl_synchronized_brace=ignore|nl_synchronized_brace=add|nl_synchronized_brace=remove|nl_synchronized_brace=force"
 ChoicesReadable="Ignore Nl Synchronized Brace|Add Nl Synchronized Brace|Remove Nl Synchronized Brace|Force Nl Synchronized Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Multi Line Cond]
 Category=3
-Description="<html>Add a newline between ')' and '{' if the ')' is on a different line than the<br/>if/for/etc.<br/><br/>Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and<br/>nl_catch_brace.</html>"
+Description="<html>Add a newline between ')' and '{' if the ')' is on a different line than the if/for/etc.<BR>Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and nl_catch_brace.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_multi_line_cond=true|nl_multi_line_cond=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Multi Line Define]
 Category=3
@@ -3350,519 +3251,519 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_multi_line_define=true|nl_multi_line_define=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Before Case]
 Category=3
-Description="<html>Whether to add a newline before 'case', and a blank line before a 'case'<br/>statement that follows a ';' or '}'.</html>"
+Description="<html>Whether to put a newline before 'case' statement, not after the first 'case'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_before_case=true|nl_before_case=false
-ValueDefault=false
+ValueDefault=0
+
+[Nl Before Throw]
+Category=3
+Description="<html>Add or remove newline between ')' and 'throw'.</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_before_throw=ignore|nl_before_throw=add|nl_before_throw=remove|nl_before_throw=force"
+ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
+ValueDefault=0
 
 [Nl After Case]
 Category=3
-Description="<html>Whether to add a newline after a 'case' statement.</html>"
+Description="<html>Whether to put a newline after 'case' statement.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_case=true|nl_after_case=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Case Colon Brace]
 Category=3
-Description="<html>Add or remove newline between a case ':' and '{'.<br/><br/>Overrides nl_after_case.</html>"
+Description="<html>Add or remove a newline between a case ':' and '{'. Overrides nl_after_case.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_case_colon_brace=ignore|nl_case_colon_brace=add|nl_case_colon_brace=remove|nl_case_colon_brace=force
+Choices="nl_case_colon_brace=ignore|nl_case_colon_brace=add|nl_case_colon_brace=remove|nl_case_colon_brace=force"
 ChoicesReadable="Ignore Nl Case Colon Brace|Add Nl Case Colon Brace|Remove Nl Case Colon Brace|Force Nl Case Colon Brace"
-ValueDefault=ignore
-
-[Nl Before Throw]
-Category=3
-Description="<html>Add or remove newline between ')' and 'throw'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_throw=ignore|nl_before_throw=add|nl_before_throw=remove|nl_before_throw=force
-ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Namespace Brace]
 Category=3
-Description="<html>Add or remove newline between 'namespace' and '{'.</html>"
+Description="<html>Newline between namespace and {.</html>"
 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"
 ChoicesReadable="Ignore Nl Namespace Brace|Add Nl Namespace Brace|Remove Nl Namespace Brace|Force Nl Namespace Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Template Class]
 Category=3
 Description="<html>Add or remove newline between 'template&lt;&gt;' and whatever follows.</html>"
 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"
 ChoicesReadable="Ignore Nl Template Class|Add Nl Template Class|Remove Nl Template Class|Force Nl Template Class"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Class Brace]
 Category=3
 Description="<html>Add or remove newline between 'class' and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Class Brace|Add Nl Class Brace|Remove Nl Class Brace|Force Nl Class Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Class Init Args]
 Category=3
-Description="<html>Add or remove newline before or after (depending on pos_class_comma) each<br/>',' in the base class list.</html>"
+Description="<html>Add or remove newline before/after each ',' in the base class list,<BR>  (tied to pos_class_comma).</html>"
 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"
 ChoicesReadable="Ignore Nl Class Init Args|Add Nl Class Init Args|Remove Nl Class Init Args|Force Nl Class Init Args"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Constr Init Args]
 Category=3
-Description="<html>Add or remove newline after each ',' in the constructor member<br/>initialization. Related to nl_constr_colon, pos_constr_colon and<br/>pos_constr_comma.</html>"
+Description="<html>Add or remove newline after each ',' in the constructor member initialization.<BR>Related to nl_constr_colon, pos_constr_colon and pos_constr_comma.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_constr_init_args=ignore|nl_constr_init_args=add|nl_constr_init_args=remove|nl_constr_init_args=force
+Choices="nl_constr_init_args=ignore|nl_constr_init_args=add|nl_constr_init_args=remove|nl_constr_init_args=force"
 ChoicesReadable="Ignore Nl Constr Init Args|Add Nl Constr Init Args|Remove Nl Constr Init Args|Force Nl Constr Init Args"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Enum Own Lines]
 Category=3
-Description="<html>Add or remove newline before first element, after comma, and after last<br/>element, in 'enum'.</html>"
+Description="<html>Add or remove newline before first element, after comma, and after last element in enum.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_enum_own_lines=ignore|nl_enum_own_lines=add|nl_enum_own_lines=remove|nl_enum_own_lines=force
+Choices="nl_enum_own_lines=ignore|nl_enum_own_lines=add|nl_enum_own_lines=remove|nl_enum_own_lines=force"
 ChoicesReadable="Ignore Nl Enum Own Lines|Add Nl Enum Own Lines|Remove Nl Enum Own Lines|Force Nl Enum Own Lines"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Type Name]
 Category=3
-Description="<html>Add or remove newline between return type and function name in a function<br/>definition.</html>"
+Description="<html>Add or remove newline between return type and function name in a function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force
+Choices="nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force"
 ChoicesReadable="Ignore Nl Func Type Name|Add Nl Func Type Name|Remove Nl Func Type Name|Force Nl Func Type Name"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Type Name Class]
 Category=3
-Description="<html>Add or remove newline between return type and function name inside a class<br/>definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name<br/>is used instead.</html>"
+Description="<html>Add or remove newline between return type and function name inside a class {}<BR>Uses nl_func_type_name or nl_func_proto_type_name if set to ignore.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_type_name_class=ignore|nl_func_type_name_class=add|nl_func_type_name_class=remove|nl_func_type_name_class=force
+Choices="nl_func_type_name_class=ignore|nl_func_type_name_class=add|nl_func_type_name_class=remove|nl_func_type_name_class=force"
 ChoicesReadable="Ignore Nl Func Type Name Class|Add Nl Func Type Name Class|Remove Nl Func Type Name Class|Force Nl Func Type Name Class"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Class Scope]
 Category=3
-Description="<html>Add or remove newline between class specification and '::'<br/>in 'void A::f() { }'. Only appears in separate member implementation (does<br/>not appear with in-line implementation).</html>"
+Description="<html>Add or remove newline between class specification and '::' in 'void A::f() { }'<BR>Only appears in separate member implementation (does not appear with in-line implmementation).</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_class_scope=ignore|nl_func_class_scope=add|nl_func_class_scope=remove|nl_func_class_scope=force
+Choices="nl_func_class_scope=ignore|nl_func_class_scope=add|nl_func_class_scope=remove|nl_func_class_scope=force"
 ChoicesReadable="Ignore Nl Func Class Scope|Add Nl Func Class Scope|Remove Nl Func Class Scope|Force Nl Func Class Scope"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Scope Name]
 Category=3
-Description="<html>Add or remove newline between function scope and name, as in<br/>'void A :: &lt;here&gt; f() { }'.</html>"
+Description="<html>Add or remove newline between function scope and name<BR>Controls the newline after '::' in 'void A::f() { }'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_scope_name=ignore|nl_func_scope_name=add|nl_func_scope_name=remove|nl_func_scope_name=force
+Choices="nl_func_scope_name=ignore|nl_func_scope_name=add|nl_func_scope_name=remove|nl_func_scope_name=force"
 ChoicesReadable="Ignore Nl Func Scope Name|Add Nl Func Scope Name|Remove Nl Func Scope Name|Force Nl Func Scope Name"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Proto Type Name]
 Category=3
 Description="<html>Add or remove newline between return type and function name in a prototype.</html>"
 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"
 ChoicesReadable="Ignore Nl Func Proto Type Name|Add Nl Func Proto Type Name|Remove Nl Func Proto Type Name|Force Nl Func Proto Type Name"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Paren]
 Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>declaration.</html>"
+Description="<html>Add or remove newline between a function name and the opening '(' in the declaration.</html>"
 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"
 ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Paren Empty]
 Category=3
 Description="<html>Overrides nl_func_paren for functions with no parameters.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_paren_empty=ignore|nl_func_paren_empty=add|nl_func_paren_empty=remove|nl_func_paren_empty=force
+Choices="nl_func_paren_empty=ignore|nl_func_paren_empty=add|nl_func_paren_empty=remove|nl_func_paren_empty=force"
 ChoicesReadable="Ignore Nl Func Paren Empty|Add Nl Func Paren Empty|Remove Nl Func Paren Empty|Force Nl Func Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def Paren]
 Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>definition.</html>"
+Description="<html>Add or remove newline between a function name and the opening '(' in the definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_paren=ignore|nl_func_def_paren=add|nl_func_def_paren=remove|nl_func_def_paren=force
+Choices="nl_func_def_paren=ignore|nl_func_def_paren=add|nl_func_def_paren=remove|nl_func_def_paren=force"
 ChoicesReadable="Ignore Nl Func Def Paren|Add Nl Func Def Paren|Remove Nl Func Def Paren|Force Nl Func Def Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def Paren Empty]
 Category=3
 Description="<html>Overrides nl_func_def_paren for functions with no parameters.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_paren_empty=ignore|nl_func_def_paren_empty=add|nl_func_def_paren_empty=remove|nl_func_def_paren_empty=force
+Choices="nl_func_def_paren_empty=ignore|nl_func_def_paren_empty=add|nl_func_def_paren_empty=remove|nl_func_def_paren_empty=force"
 ChoicesReadable="Ignore Nl Func Def Paren Empty|Add Nl Func Def Paren Empty|Remove Nl Func Def Paren Empty|Force Nl Func Def Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Call Paren]
 Category=3
-Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>call.</html>"
+Description="<html>Add or remove newline between a function name and the opening '(' in the call</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_call_paren=ignore|nl_func_call_paren=add|nl_func_call_paren=remove|nl_func_call_paren=force
+Choices="nl_func_call_paren=ignore|nl_func_call_paren=add|nl_func_call_paren=remove|nl_func_call_paren=force"
 ChoicesReadable="Ignore Nl Func Call Paren|Add Nl Func Call Paren|Remove Nl Func Call Paren|Force Nl Func Call Paren"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Call Paren Empty]
 Category=3
 Description="<html>Overrides nl_func_call_paren for functions with no parameters.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_call_paren_empty=ignore|nl_func_call_paren_empty=add|nl_func_call_paren_empty=remove|nl_func_call_paren_empty=force
+Choices="nl_func_call_paren_empty=ignore|nl_func_call_paren_empty=add|nl_func_call_paren_empty=remove|nl_func_call_paren_empty=force"
 ChoicesReadable="Ignore Nl Func Call Paren Empty|Add Nl Func Call Paren Empty|Remove Nl Func Call Paren Empty|Force Nl Func Call Paren Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Decl Start]
 Category=3
 Description="<html>Add or remove newline after '(' in a function declaration.</html>"
 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"
 ChoicesReadable="Ignore Nl Func Decl Start|Add Nl Func Decl Start|Remove Nl Func Decl Start|Force Nl Func Decl Start"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def Start]
 Category=3
 Description="<html>Add or remove newline after '(' in a function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_start=ignore|nl_func_def_start=add|nl_func_def_start=remove|nl_func_def_start=force
+Choices="nl_func_def_start=ignore|nl_func_def_start=add|nl_func_def_start=remove|nl_func_def_start=force"
 ChoicesReadable="Ignore Nl Func Def Start|Add Nl Func Def Start|Remove Nl Func Def Start|Force Nl Func Def Start"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Decl Start Single]
 Category=3
 Description="<html>Overrides nl_func_decl_start when there is only one parameter.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_decl_start_single=ignore|nl_func_decl_start_single=add|nl_func_decl_start_single=remove|nl_func_decl_start_single=force
+Choices="nl_func_decl_start_single=ignore|nl_func_decl_start_single=add|nl_func_decl_start_single=remove|nl_func_decl_start_single=force"
 ChoicesReadable="Ignore Nl Func Decl Start Single|Add Nl Func Decl Start Single|Remove Nl Func Decl Start Single|Force Nl Func Decl Start Single"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def Start Single]
 Category=3
 Description="<html>Overrides nl_func_def_start when there is only one parameter.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_start_single=ignore|nl_func_def_start_single=add|nl_func_def_start_single=remove|nl_func_def_start_single=force
+Choices="nl_func_def_start_single=ignore|nl_func_def_start_single=add|nl_func_def_start_single=remove|nl_func_def_start_single=force"
 ChoicesReadable="Ignore Nl Func Def Start Single|Add Nl Func Def Start Single|Remove Nl Func Def Start Single|Force Nl Func Def Start Single"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Decl Start Multi Line]
 Category=3
-Description="<html>Whether to add a newline after '(' in a function declaration if '(' and ')'<br/>are in different lines. If false, nl_func_decl_start is used instead.</html>"
+Description="<html>Whether to add newline after '(' in a function declaration if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_decl_start_multi_line=true|nl_func_decl_start_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Def Start Multi Line]
 Category=3
-Description="<html>Whether to add a newline after '(' in a function definition if '(' and ')'<br/>are in different lines. If false, nl_func_def_start is used instead.</html>"
+Description="<html>Whether to add newline after '(' in a function definition if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_def_start_multi_line=true|nl_func_def_start_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Decl Args]
 Category=3
 Description="<html>Add or remove newline after each ',' in a function declaration.</html>"
 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"
 ChoicesReadable="Ignore Nl Func Decl Args|Add Nl Func Decl Args|Remove Nl Func Decl Args|Force Nl Func Decl Args"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def Args]
 Category=3
 Description="<html>Add or remove newline after each ',' in a function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_args=ignore|nl_func_def_args=add|nl_func_def_args=remove|nl_func_def_args=force
+Choices="nl_func_def_args=ignore|nl_func_def_args=add|nl_func_def_args=remove|nl_func_def_args=force"
 ChoicesReadable="Ignore Nl Func Def Args|Add Nl Func Def Args|Remove Nl Func Def Args|Force Nl Func Def Args"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Decl Args Multi Line]
 Category=3
-Description="<html>Whether to add a newline after each ',' in a function declaration if '('<br/>and ')' are in different lines. If false, nl_func_decl_args is used instead.</html>"
+Description="<html>Whether to add newline after each ',' in a function declaration if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_decl_args_multi_line=true|nl_func_decl_args_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Def Args Multi Line]
 Category=3
-Description="<html>Whether to add a newline after each ',' in a function definition if '('<br/>and ')' are in different lines. If false, nl_func_def_args is used instead.</html>"
+Description="<html>Whether to add newline after each ',' in a function definition if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_def_args_multi_line=true|nl_func_def_args_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Decl End]
 Category=3
 Description="<html>Add or remove newline before the ')' in a function declaration.</html>"
 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"
 ChoicesReadable="Ignore Nl Func Decl End|Add Nl Func Decl End|Remove Nl Func Decl End|Force Nl Func Decl End"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def End]
 Category=3
 Description="<html>Add or remove newline before the ')' in a function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_end=ignore|nl_func_def_end=add|nl_func_def_end=remove|nl_func_def_end=force
+Choices="nl_func_def_end=ignore|nl_func_def_end=add|nl_func_def_end=remove|nl_func_def_end=force"
 ChoicesReadable="Ignore Nl Func Def End|Add Nl Func Def End|Remove Nl Func Def End|Force Nl Func Def End"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Decl End Single]
 Category=3
 Description="<html>Overrides nl_func_decl_end when there is only one parameter.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_decl_end_single=ignore|nl_func_decl_end_single=add|nl_func_decl_end_single=remove|nl_func_decl_end_single=force
+Choices="nl_func_decl_end_single=ignore|nl_func_decl_end_single=add|nl_func_decl_end_single=remove|nl_func_decl_end_single=force"
 ChoicesReadable="Ignore Nl Func Decl End Single|Add Nl Func Decl End Single|Remove Nl Func Decl End Single|Force Nl Func Decl End Single"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def End Single]
 Category=3
 Description="<html>Overrides nl_func_def_end when there is only one parameter.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_end_single=ignore|nl_func_def_end_single=add|nl_func_def_end_single=remove|nl_func_def_end_single=force
+Choices="nl_func_def_end_single=ignore|nl_func_def_end_single=add|nl_func_def_end_single=remove|nl_func_def_end_single=force"
 ChoicesReadable="Ignore Nl Func Def End Single|Add Nl Func Def End Single|Remove Nl Func Def End Single|Force Nl Func Def End Single"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Decl End Multi Line]
 Category=3
-Description="<html>Whether to add a newline before ')' in a function declaration if '(' and ')'<br/>are in different lines. If false, nl_func_decl_end is used instead.</html>"
+Description="<html>Whether to add newline before ')' in a function declaration if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_decl_end_multi_line=true|nl_func_decl_end_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Def End Multi Line]
 Category=3
-Description="<html>Whether to add a newline before ')' in a function definition if '(' and ')'<br/>are in different lines. If false, nl_func_def_end is used instead.</html>"
+Description="<html>Whether to add newline before ')' in a function definition if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_def_end_multi_line=true|nl_func_def_end_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Decl Empty]
 Category=3
 Description="<html>Add or remove newline between '()' in a function declaration.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_decl_empty=ignore|nl_func_decl_empty=add|nl_func_decl_empty=remove|nl_func_decl_empty=force
+Choices="nl_func_decl_empty=ignore|nl_func_decl_empty=add|nl_func_decl_empty=remove|nl_func_decl_empty=force"
 ChoicesReadable="Ignore Nl Func Decl Empty|Add Nl Func Decl Empty|Remove Nl Func Decl Empty|Force Nl Func Decl Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Def Empty]
 Category=3
 Description="<html>Add or remove newline between '()' in a function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_def_empty=ignore|nl_func_def_empty=add|nl_func_def_empty=remove|nl_func_def_empty=force
+Choices="nl_func_def_empty=ignore|nl_func_def_empty=add|nl_func_def_empty=remove|nl_func_def_empty=force"
 ChoicesReadable="Ignore Nl Func Def Empty|Add Nl Func Def Empty|Remove Nl Func Def Empty|Force Nl Func Def Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Call Empty]
 Category=3
 Description="<html>Add or remove newline between '()' in a function call.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_call_empty=ignore|nl_func_call_empty=add|nl_func_call_empty=remove|nl_func_call_empty=force
+Choices="nl_func_call_empty=ignore|nl_func_call_empty=add|nl_func_call_empty=remove|nl_func_call_empty=force"
 ChoicesReadable="Ignore Nl Func Call Empty|Add Nl Func Call Empty|Remove Nl Func Call Empty|Force Nl Func Call Empty"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Func Call Start Multi Line]
 Category=3
-Description="<html>Whether to add a newline after '(' in a function call if '(' and ')' are in<br/>different lines.</html>"
+Description="<html>Whether to add newline after '(' in a function call if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_call_start_multi_line=true|nl_func_call_start_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Call Args Multi Line]
 Category=3
-Description="<html>Whether to add a newline after each ',' in a function call if '(' and ')'<br/>are in different lines.</html>"
+Description="<html>Whether to add newline after each ',' in a function call if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_call_args_multi_line=true|nl_func_call_args_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Func Call End Multi Line]
 Category=3
-Description="<html>Whether to add a newline before ')' in a function call if '(' and ')' are in<br/>different lines.</html>"
+Description="<html>Whether to add newline before ')' in a function call if '(' and ')' are in different lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_call_end_multi_line=true|nl_func_call_end_multi_line=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Oc Msg Args]
 Category=3
-Description="<html>(OC) Whether to put each Objective-C message parameter on a separate line.<br/>See nl_oc_msg_leave_one_liner.</html>"
+Description="<html>Whether to put each OC message parameter on a separate line<BR>See nl_oc_msg_leave_one_liner.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_oc_msg_args=true|nl_oc_msg_args=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Fdef Brace]
 Category=3
 Description="<html>Add or remove newline between function signature and '{'.</html>"
 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"
 ChoicesReadable="Ignore Nl Fdef Brace|Add Nl Fdef Brace|Remove Nl Fdef Brace|Force Nl Fdef Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Cpp Ldef Brace]
 Category=3
 Description="<html>Add or remove newline between C++11 lambda signature and '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_cpp_ldef_brace=ignore|nl_cpp_ldef_brace=add|nl_cpp_ldef_brace=remove|nl_cpp_ldef_brace=force
+Choices="nl_cpp_ldef_brace=ignore|nl_cpp_ldef_brace=add|nl_cpp_ldef_brace=remove|nl_cpp_ldef_brace=force"
 ChoicesReadable="Ignore Nl Cpp Ldef Brace|Add Nl Cpp Ldef Brace|Remove Nl Cpp Ldef Brace|Force Nl Cpp Ldef Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Return Expr]
 Category=3
-Description="<html>Add or remove newline between 'return' and the return expression.</html>"
+Description="<html>Add or remove a newline between the return keyword and return expression.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return_expr=force
+Choices="nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return_expr=force"
 ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After Semicolon]
 Category=3
-Description="<html>Whether to add a newline after semicolons, except in 'for' statements.</html>"
+Description="<html>Whether to put a newline after semicolons, except in 'for' statements.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_semicolon=true|nl_after_semicolon=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Paren Dbrace Open]
 Category=3
-Description="<html>(Java) Add or remove newline between the ')' and '{{' of the double brace<br/>initializer.</html>"
+Description="<html>Java: Control the newline between the ')' and '{{' of the double brace initializer.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_paren_dbrace_open=ignore|nl_paren_dbrace_open=add|nl_paren_dbrace_open=remove|nl_paren_dbrace_open=force
+Choices="nl_paren_dbrace_open=ignore|nl_paren_dbrace_open=add|nl_paren_dbrace_open=remove|nl_paren_dbrace_open=force"
 ChoicesReadable="Ignore Nl Paren Dbrace Open|Add Nl Paren Dbrace Open|Remove Nl Paren Dbrace Open|Force Nl Paren Dbrace Open"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Type Brace Init Lst]
 Category=3
-Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Whether to put a newline after the type in an unnamed temporary direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_type_brace_init_lst=ignore|nl_type_brace_init_lst=add|nl_type_brace_init_lst=remove|nl_type_brace_init_lst=force
+Choices="nl_type_brace_init_lst=ignore|nl_type_brace_init_lst=add|nl_type_brace_init_lst=remove|nl_type_brace_init_lst=force"
 ChoicesReadable="Ignore Nl Type Brace Init Lst|Add Nl Type Brace Init Lst|Remove Nl Type Brace Init Lst|Force Nl Type Brace Init Lst"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Type Brace Init Lst Open]
 Category=3
-Description="<html>Whether to add a newline after the open brace in an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Whether to put a newline after open brace in an unnamed temporary direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_type_brace_init_lst_open=ignore|nl_type_brace_init_lst_open=add|nl_type_brace_init_lst_open=remove|nl_type_brace_init_lst_open=force
+Choices="nl_type_brace_init_lst_open=ignore|nl_type_brace_init_lst_open=add|nl_type_brace_init_lst_open=remove|nl_type_brace_init_lst_open=force"
 ChoicesReadable="Ignore Nl Type Brace Init Lst Open|Add Nl Type Brace Init Lst Open|Remove Nl Type Brace Init Lst Open|Force Nl Type Brace Init Lst Open"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Type Brace Init Lst Close]
 Category=3
-Description="<html>Whether to add a newline before the close brace in an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Whether to put a newline before close brace in an unnamed temporary direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_type_brace_init_lst_close=ignore|nl_type_brace_init_lst_close=add|nl_type_brace_init_lst_close=remove|nl_type_brace_init_lst_close=force
+Choices="nl_type_brace_init_lst_close=ignore|nl_type_brace_init_lst_close=add|nl_type_brace_init_lst_close=remove|nl_type_brace_init_lst_close=force"
 ChoicesReadable="Ignore Nl Type Brace Init Lst Close|Add Nl Type Brace Init Lst Close|Remove Nl Type Brace Init Lst Close|Force Nl Type Brace Init Lst Close"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After Brace Open]
 Category=3
-Description="<html>Whether to add a newline after '{'. This also adds a newline before the<br/>matching '}'.</html>"
+Description="<html>Whether to put a newline after brace open.<BR>This also adds a newline before the matching brace close.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_brace_open=true|nl_after_brace_open=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Brace Open Cmt]
 Category=3
-Description="<html>Whether to add a newline between the open brace and a trailing single-line<br/>comment. Requires nl_after_brace_open=true.</html>"
+Description="<html>If nl_after_brace_open and nl_after_brace_open_cmt are True, a newline is<BR>placed between the open brace and a trailing single-line comment.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_brace_open_cmt=true|nl_after_brace_open_cmt=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Vbrace Open]
 Category=3
-Description="<html>Whether to add a newline after a virtual brace open with a non-empty body.<br/>These occur in un-braced if/while/do/for statement bodies.</html>"
+Description="<html>Whether to put a newline after a virtual brace open with a non-empty body.<BR>These occur in un-braced if/while/do/for statement bodies.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_vbrace_open=true|nl_after_vbrace_open=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Vbrace Open Empty]
 Category=3
-Description="<html>Whether to add a newline after a virtual brace open with an empty body.<br/>These occur in un-braced if/while/do/for statement bodies.</html>"
+Description="<html>Whether to put a newline after a virtual brace open with an empty body.<BR>These occur in un-braced if/while/do/for statement bodies.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_vbrace_open_empty=true|nl_after_vbrace_open_empty=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Brace Close]
 Category=3
-Description="<html>Whether to add a newline after '}'. Does not apply if followed by a<br/>necessary ';'.</html>"
+Description="<html>Whether to put a newline after a brace close.<BR>Does not apply if followed by a necessary ';'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_brace_close=true|nl_after_brace_close=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Vbrace Close]
 Category=3
-Description="<html>Whether to add a newline after a virtual brace close,<br/>as in 'if (foo) a++; &lt;here&gt; return;'.</html>"
+Description="<html>Whether to put a newline after a virtual brace close.<BR>Would add a newline before return in: 'if (foo) a++; return;'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_vbrace_close=true|nl_after_vbrace_close=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Brace Struct Var]
 Category=3
-Description="<html>Add or remove newline between the close brace and identifier,<br/>as in 'struct { int a; } &lt;here&gt; b;'. Affects enumerations, unions and<br/>structures. If set to ignore, uses nl_after_brace_close.</html>"
+Description="<html>Control the newline between the close brace and 'b' in: 'struct { int a; } b;'<BR>Affects enums, unions and structures. If set to ignore, uses nl_after_brace_close.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_brace_struct_var=ignore|nl_brace_struct_var=add|nl_brace_struct_var=remove|nl_brace_struct_var=force
+Choices="nl_brace_struct_var=ignore|nl_brace_struct_var=add|nl_brace_struct_var=remove|nl_brace_struct_var=force"
 ChoicesReadable="Ignore Nl Brace Struct Var|Add Nl Brace Struct Var|Remove Nl Brace Struct Var|Force Nl Brace Struct Var"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Define Macro]
 Category=3
@@ -3870,23 +3771,23 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_define_macro=true|nl_define_macro=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Squeeze Paren Close]
 Category=3
-Description="<html>Whether to alter newlines between consecutive parenthesis closes. The number<br/>of closing parentheses in a line will depend on respective open parenthesis<br/>lines.</html>"
+Description="<html>Whether to alter newlines between consecutive paren closes, <BR>The number of closing paren in a line will depend on respective open paren lines</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_squeeze_paren_close=true|nl_squeeze_paren_close=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Squeeze Ifdef]
 Category=3
-Description="<html>Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and<br/>'#endif'. Does not affect top-level #ifdefs.</html>"
+Description="<html>Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and '#endif'. Does not affect top-level #ifdefs.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_squeeze_ifdef=true|nl_squeeze_ifdef=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Squeeze Ifdef Top Level]
 Category=3
@@ -3894,217 +3795,237 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_squeeze_ifdef_top_level=true|nl_squeeze_ifdef_top_level=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Before If]
 Category=3
 Description="<html>Add or remove blank line before 'if'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force
+Choices="nl_before_if=ignore|nl_before_if=add|nl_before_if=remove|nl_before_if=force"
 ChoicesReadable="Ignore Nl Before If|Add Nl Before If|Remove Nl Before If|Force Nl Before If"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After If]
 Category=3
-Description="<html>Add or remove blank line after 'if' statement. Add/Force work only if the<br/>next token is not a closing brace.</html>"
+Description="<html>Add or remove blank line after 'if' statement.<BR>Add/Force work only if the next token is not a closing brace.</html>"
 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"
 ChoicesReadable="Ignore Nl After If|Add Nl After If|Remove Nl After If|Force Nl After If"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Before For]
 Category=3
 Description="<html>Add or remove blank line before 'for'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force
+Choices="nl_before_for=ignore|nl_before_for=add|nl_before_for=remove|nl_before_for=force"
 ChoicesReadable="Ignore Nl Before For|Add Nl Before For|Remove Nl Before For|Force Nl Before For"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After For]
 Category=3
 Description="<html>Add or remove blank line after 'for' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force
+Choices="nl_after_for=ignore|nl_after_for=add|nl_after_for=remove|nl_after_for=force"
 ChoicesReadable="Ignore Nl After For|Add Nl After For|Remove Nl After For|Force Nl After For"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Before While]
 Category=3
 Description="<html>Add or remove blank line before 'while'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force
+Choices="nl_before_while=ignore|nl_before_while=add|nl_before_while=remove|nl_before_while=force"
 ChoicesReadable="Ignore Nl Before While|Add Nl Before While|Remove Nl Before While|Force Nl Before While"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After While]
 Category=3
 Description="<html>Add or remove blank line after 'while' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force
+Choices="nl_after_while=ignore|nl_after_while=add|nl_after_while=remove|nl_after_while=force"
 ChoicesReadable="Ignore Nl After While|Add Nl After While|Remove Nl After While|Force Nl After While"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Before Switch]
 Category=3
 Description="<html>Add or remove blank line before 'switch'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force
+Choices="nl_before_switch=ignore|nl_before_switch=add|nl_before_switch=remove|nl_before_switch=force"
 ChoicesReadable="Ignore Nl Before Switch|Add Nl Before Switch|Remove Nl Before Switch|Force Nl Before Switch"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After Switch]
 Category=3
 Description="<html>Add or remove blank line after 'switch' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force
+Choices="nl_after_switch=ignore|nl_after_switch=add|nl_after_switch=remove|nl_after_switch=force"
 ChoicesReadable="Ignore Nl After Switch|Add Nl After Switch|Remove Nl After Switch|Force Nl After Switch"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Before Synchronized]
 Category=3
 Description="<html>Add or remove blank line before 'synchronized'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_synchronized=ignore|nl_before_synchronized=add|nl_before_synchronized=remove|nl_before_synchronized=force
+Choices="nl_before_synchronized=ignore|nl_before_synchronized=add|nl_before_synchronized=remove|nl_before_synchronized=force"
 ChoicesReadable="Ignore Nl Before Synchronized|Add Nl Before Synchronized|Remove Nl Before Synchronized|Force Nl Before Synchronized"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After Synchronized]
 Category=3
 Description="<html>Add or remove blank line after 'synchronized' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_synchronized=ignore|nl_after_synchronized=add|nl_after_synchronized=remove|nl_after_synchronized=force
+Choices="nl_after_synchronized=ignore|nl_after_synchronized=add|nl_after_synchronized=remove|nl_after_synchronized=force"
 ChoicesReadable="Ignore Nl After Synchronized|Add Nl After Synchronized|Remove Nl After Synchronized|Force Nl After Synchronized"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Before Do]
 Category=3
 Description="<html>Add or remove blank line before 'do'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force
+Choices="nl_before_do=ignore|nl_before_do=add|nl_before_do=remove|nl_before_do=force"
 ChoicesReadable="Ignore Nl Before Do|Add Nl Before Do|Remove Nl Before Do|Force Nl Before Do"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl After Do]
 Category=3
 Description="<html>Add or remove blank line after 'do/while' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force
+Choices="nl_after_do=ignore|nl_after_do=add|nl_after_do=remove|nl_after_do=force"
 ChoicesReadable="Ignore Nl After Do|Add Nl After Do|Remove Nl After Do|Force Nl After Do"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Ds Struct Enum Cmt]
 Category=3
-Description="<html>Whether to double-space commented-entries in 'struct'/'union'/'enum'.</html>"
+Description="<html>Whether to double-space commented-entries in struct/union/enum.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_ds_struct_enum_cmt=true|nl_ds_struct_enum_cmt=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Ds Struct Enum Close Brace]
 Category=3
-Description="<html>Whether to force a newline before '}' of a 'struct'/'union'/'enum'.<br/>(Lower priority than eat_blanks_before_close_brace.)</html>"
+Description="<html>force nl before } of a struct/union/enum<BR>(lower priority than 'eat_blanks_before_close_brace').</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_ds_struct_enum_close_brace=true|nl_ds_struct_enum_close_brace=false
-ValueDefault=false
+ValueDefault=0
+
+[Nl Before Func Class Def]
+Category=3
+Description="<html>Add or remove blank line before 'func_class_def'.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_func_class_def="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Before Func Class Proto]
+Category=3
+Description="<html>Add or remove blank line before 'func_class_proto'.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_func_class_proto="
+MinVal=0
+MaxVal=16
+ValueDefault=0
 
 [Nl Class Colon]
 Category=3
-Description="<html>Add or remove newline before or after (depending on pos_class_colon) a class<br/>colon, as in 'class Foo &lt;here&gt; : &lt;or here&gt; public Bar'.</html>"
+Description="<html>Add or remove a newline before/after a class colon,<BR>  (tied to pos_class_colon).</html>"
 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"
 ChoicesReadable="Ignore Nl Class Colon|Add Nl Class Colon|Remove Nl Class Colon|Force Nl Class Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Constr Colon]
 Category=3
-Description="<html>Add or remove newline around a class constructor colon. The exact position<br/>depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.</html>"
+Description="<html>Add or remove a newline around a class constructor colon.<BR>Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_constr_colon=ignore|nl_constr_colon=add|nl_constr_colon=remove|nl_constr_colon=force
+Choices="nl_constr_colon=ignore|nl_constr_colon=add|nl_constr_colon=remove|nl_constr_colon=force"
 ChoicesReadable="Ignore Nl Constr Colon|Add Nl Constr Colon|Remove Nl Constr Colon|Force Nl Constr Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Namespace Two To One Liner]
 Category=3
-Description="<html>Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'<br/>into a single line. If true, prevents other brace newline rules from turning<br/>such code into four lines.</html>"
+Description="<html>If true turns two liner namespace to one liner,else will make then four liners</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_namespace_two_to_one_liner=true|nl_namespace_two_to_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Create If One Liner]
 Category=3
-Description="<html>Whether to remove a newline in simple unbraced if statements, turning them<br/>into one-liners, as in 'if(b)\n i++;' → 'if(b) i++;'.</html>"
+Description="<html>Change simple unbraced if statements into a one-liner<BR>'if(b)\n i++;' =&gt; 'if(b) i++;'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_create_if_one_liner=true|nl_create_if_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Create For One Liner]
 Category=3
-Description="<html>Whether to remove a newline in simple unbraced for statements, turning them<br/>into one-liners, as in 'for (...)\n stmt;' → 'for (...) stmt;'.</html>"
+Description="<html>Change simple unbraced for statements into a one-liner<BR>'for (i=0;i&lt;5;i++)\n foo(i);' =&gt; 'for (i=0;i&lt;5;i++) foo(i);'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_create_for_one_liner=true|nl_create_for_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Create While One Liner]
 Category=3
-Description="<html>Whether to remove a newline in simple unbraced while statements, turning<br/>them into one-liners, as in 'while (expr)\n stmt;' → 'while (expr) stmt;'.</html>"
+Description="<html>Change simple unbraced while statements into a one-liner<BR>'while (i&lt;5)\n foo(i++);' =&gt; 'while (i&lt;5) foo(i++);'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_create_while_one_liner=true|nl_create_while_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Create Func Def One Liner]
 Category=3
-Description="<html>Whether to collapse a function definition whose body (not counting braces)<br/>is only one line so that the entire definition (prototype, braces, body) is<br/>a single line.</html>"
+Description="<html>Change simple 4,3,2 liner function def statements into a one-liner<BR></html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_create_func_def_one_liner=true|nl_create_func_def_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Split If One Liner]
 Category=3
-Description="<html>Whether to split one-line simple unbraced if statements into two lines by<br/>adding a newline, as in 'if(b) &lt;here&gt; i++;'.</html>"
+Description="<html> Change a one-liner if statement into simple unbraced if<BR>'if(b) i++;' =&gt; 'if(b)\n i++;'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_split_if_one_liner=true|nl_split_if_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Split For One Liner]
 Category=3
-Description="<html>Whether to split one-line simple unbraced for statements into two lines by<br/>adding a newline, as in 'for (...) &lt;here&gt; stmt;'.</html>"
+Description="<html>Change a one-liner for statement into simple unbraced for<BR>'for (i=0;&lt;5;i++) foo(i);' =&gt; 'for (i=0;&lt;5;i++)\n foo(i);'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_split_for_one_liner=true|nl_split_for_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Split While One Liner]
 Category=3
-Description="<html>Whether to split one-line simple unbraced while statements into two lines by<br/>adding a newline, as in 'while (expr) &lt;here&gt; stmt;'.</html>"
+Description="<html>Change a one-liner while statement into simple unbraced while<BR>'while (i&lt;5) foo(i++);' =&gt; 'while (i&lt;5)\n foo(i++);'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_split_while_one_liner=true|nl_split_while_one_liner=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Max]
 Category=4
-Description="<html>The maximum number of consecutive newlines (3 = 2 blank lines).</html>"
+Description="<html>The maximum consecutive newlines (3 = 2 blank lines).</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_max="
@@ -4114,7 +4035,7 @@
 
 [Nl Max Blank In Func]
 Category=4
-Description="<html>The maximum number of consecutive newlines in a function.</html>"
+Description="<html>The maximum consecutive newlines in function.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_max_blank_in_func="
@@ -4122,94 +4043,66 @@
 MaxVal=16
 ValueDefault=0
 
-[Nl Before Func Body Proto]
-Category=4
-Description="<html>The number of newlines before a function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_body_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Body Def]
-Category=4
-Description="<html>The number of newlines before a multi-line function definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_body_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Class Proto]
+[Nl After Func Proto]
 Category=4
-Description="<html>The number of newlines before a class constructor/destructor prototype.</html>"
+Description="<html>The number of newlines after a function prototype, if followed by another function prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_func_class_proto="
+CallName="nl_after_func_proto="
 MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl Before Func Class Def]
+[Nl After Func Proto Group]
 Category=4
-Description="<html>The number of newlines before a class constructor/destructor definition.</html>"
+Description="<html>The number of newlines after a function prototype, if not followed by another function prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_func_class_def="
+CallName="nl_after_func_proto_group="
 MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl After Func Proto]
+[Nl After Func Class Proto]
 Category=4
-Description="<html>The number of newlines after a function prototype.</html>"
+Description="<html>The number of newlines after a function class prototype, if followed by another function class prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_proto="
+CallName="nl_after_func_class_proto="
 MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl After Func Proto Group]
+[Nl After Func Class Proto Group]
 Category=4
-Description="<html>The number of newlines after a function prototype, if not followed by<br/>another function prototype.</html>"
+Description="<html>The number of newlines after a function class prototype, if not followed by another function class prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_proto_group="
+CallName="nl_after_func_class_proto_group="
 MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl After Func Class Proto]
+[Nl Before Func Body Def]
 Category=4
-Description="<html>The number of newlines after a class constructor/destructor prototype.</html>"
+Description="<html>The number of newlines before a multi-line function def body.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_class_proto="
+CallName="nl_before_func_body_def="
 MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl After Func Class Proto Group]
+[Nl Before Func Body Proto]
 Category=4
-Description="<html>The number of newlines after a class constructor/destructor prototype,<br/>if not followed by another constructor/destructor prototype.</html>"
+Description="<html>The number of newlines before a multi-line function prototype body.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_class_proto_group="
+CallName="nl_before_func_body_proto="
 MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[Nl Class Leave One Liner Groups]
-Category=4
-Description="<html>Whether one-line method definitions inside a class body should be treated<br/>as if they were prototypes for the purposes of adding newlines.<br/><br/>Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def<br/>and nl_before_func_class_def for one-liners.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_class_leave_one_liner_groups=true|nl_class_leave_one_liner_groups=false
-ValueDefault=false
-
 [Nl After Func Body]
 Category=4
 Description="<html>The number of newlines after '}' of a multi-line function body.</html>"
@@ -4222,7 +4115,7 @@
 
 [Nl After Func Body Class]
 Category=4
-Description="<html>The number of newlines after '}' of a multi-line function body in a class<br/>declaration. Also affects class constructors/destructors.<br/><br/>Overrides nl_after_func_body.</html>"
+Description="<html>The number of newlines after '}' of a multi-line function body in a class declaration.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_after_func_body_class="
@@ -4232,7 +4125,7 @@
 
 [Nl After Func Body One Liner]
 Category=4
-Description="<html>The number of newlines after '}' of a single line function body. Also<br/>affects class constructors/destructors.<br/><br/>Overrides nl_after_func_body and nl_after_func_body_class.</html>"
+Description="<html>The number of newlines after '}' of a single line function body.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_after_func_body_one_liner="
@@ -4242,7 +4135,7 @@
 
 [Nl Before Block Comment]
 Category=4
-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>"
+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>"
 Enabled=false
 EditorType=numeric
 CallName="nl_before_block_comment="
@@ -4252,7 +4145,7 @@
 
 [Nl Before C Comment]
 Category=4
-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>"
+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>"
 Enabled=false
 EditorType=numeric
 CallName="nl_before_c_comment="
@@ -4262,7 +4155,7 @@
 
 [Nl Before Cpp Comment]
 Category=4
-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>"
+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>"
 Enabled=false
 EditorType=numeric
 CallName="nl_before_cpp_comment="
@@ -4276,7 +4169,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_multiline_comment=true|nl_after_multiline_comment=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Label Colon]
 Category=4
@@ -4284,7 +4177,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_label_colon=true|nl_after_label_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Struct]
 Category=4
@@ -4318,7 +4211,7 @@
 
 [Nl Before Access Spec]
 Category=4
-Description="<html>The number of newlines before an access specifier label. This also includes<br/>the Qt-specific 'signals:' and 'slots:'. Will not change the newline count<br/>if after a brace open.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.<BR>Will not change the newline count if after a brace open.<BR>0 = No change.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_before_access_spec="
@@ -4328,7 +4221,7 @@
 
 [Nl After Access Spec]
 Category=4
-Description="<html>The number of newlines after an access specifier label. This also includes<br/>the Qt-specific 'signals:' and 'slots:'. Will not change the newline count<br/>if after a brace open.<br/><br/>0 = No change (default).<br/><br/>Overrides nl_typedef_blk_start and nl_var_def_blk_start.</html>"
+Description="<html>The number of newlines after a 'private:', 'public:', 'protected:', 'signals:' or 'slots:' label.<BR>0 = No change.<BR>Overrides 'nl_typedef_blk_start' and 'nl_var_def_blk_start'.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_after_access_spec="
@@ -4338,7 +4231,7 @@
 
 [Nl Comment Func Def]
 Category=4
-Description="<html>The number of newlines between a function definition and the function<br/>comment, as in '// comment\n &lt;here&gt; void foo() {...}'.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines between a function def and the function comment.<BR>0 = No change.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_comment_func_def="
@@ -4348,7 +4241,7 @@
 
 [Nl After Try Catch Finally]
 Category=4
-Description="<html>The number of newlines after a try-catch-finally block that isn't followed<br/>by a brace close.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines after a try-catch-finally block that isn't followed by a brace close.<BR>0 = No change.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_after_try_catch_finally="
@@ -4358,7 +4251,7 @@
 
 [Nl Around Cs Property]
 Category=4
-Description="<html>(C#) The number of newlines before and after a property, indexer or event<br/>declaration.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines before and after a property, indexer or event decl.<BR>0 = No change.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_around_cs_property="
@@ -4368,7 +4261,7 @@
 
 [Nl Between Get Set]
 Category=4
-Description="<html>(C#) The number of newlines between the get/set/add/remove handlers.<br/><br/>0 = No change (default).</html>"
+Description="<html>The number of newlines between the get/set/add/remove handlers in C#.<BR>0 = No change.</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_between_get_set="
@@ -4378,21 +4271,11 @@
 
 [Nl Property Brace]
 Category=4
-Description="<html>(C#) Add or remove newline between property and the '{'.</html>"
+Description="<html>Add or remove newline between C# property and the '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_property_brace=ignore|nl_property_brace=add|nl_property_brace=remove|nl_property_brace=force
+Choices="nl_property_brace=ignore|nl_property_brace=add|nl_property_brace=remove|nl_property_brace=force"
 ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
-ValueDefault=ignore
-
-[Nl Inside Namespace]
-Category=4
-Description="<html>The number of newlines after '{' of a namespace. This also adds newlines<br/>before the matching '}'.<br/><br/>0 = Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if<br/>    applicable, otherwise no change.<br/><br/>Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_inside_namespace="
-MinVal=0
-MaxVal=16
 ValueDefault=0
 
 [Eat Blanks After Open Brace]
@@ -4401,7 +4284,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=eat_blanks_after_open_brace=true|eat_blanks_after_open_brace=false
-ValueDefault=false
+ValueDefault=0
 
 [Eat Blanks Before Close Brace]
 Category=4
@@ -4409,11 +4292,11 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=eat_blanks_before_close_brace=true|eat_blanks_before_close_brace=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl Remove Extra Newlines]
 Category=4
-Description="<html>How aggressively to remove extra newlines not in preprocessor.<br/><br/>0: No change (default)<br/>1: Remove most newlines not handled by other config<br/>2: Remove all newlines and reformat completely by config</html>"
+Description="<html>How aggressively to remove extra newlines not in preproc.<BR>0: No change<BR>1: Remove most newlines not handled by other config<BR>2: Remove all newlines and reformat completely by config</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_remove_extra_newlines="
@@ -4423,140 +4306,140 @@
 
 [Nl Before Return]
 Category=4
-Description="<html>Whether to put a blank line before 'return' statements, unless after an open<br/>brace.</html>"
+Description="<html>Whether to put a blank line before 'return' statements, unless after an open brace.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_before_return=true|nl_before_return=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Return]
 Category=4
-Description="<html>Whether to put a blank line after 'return' statements, unless followed by a<br/>close brace.</html>"
+Description="<html>Whether to put a blank line after 'return' statements, unless followed by a close brace.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_after_return=true|nl_after_return=false
-ValueDefault=false
+ValueDefault=0
 
 [Nl After Annotation]
 Category=4
-Description="<html>(Java) Add or remove newline after an annotation statement. Only affects<br/>annotations that are after a newline.</html>"
+Description="<html>Whether to put a newline after a Java annotation statement.<BR>Only affects annotations that are after a newline.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_annotation=ignore|nl_after_annotation=add|nl_after_annotation=remove|nl_after_annotation=force
+Choices="nl_after_annotation=ignore|nl_after_annotation=add|nl_after_annotation=remove|nl_after_annotation=force"
 ChoicesReadable="Ignore Nl After Annotation|Add Nl After Annotation|Remove Nl After Annotation|Force Nl After Annotation"
-ValueDefault=ignore
+ValueDefault=0
 
 [Nl Between Annotation]
 Category=4
-Description="<html>(Java) Add or remove newline between two annotations.</html>"
+Description="<html>Controls the newline between two annotations.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_between_annotation=ignore|nl_between_annotation=add|nl_between_annotation=remove|nl_between_annotation=force
+Choices="nl_between_annotation=ignore|nl_between_annotation=add|nl_between_annotation=remove|nl_between_annotation=force"
 ChoicesReadable="Ignore Nl Between Annotation|Add Nl Between Annotation|Remove Nl Between Annotation|Force Nl Between Annotation"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Arith]
 Category=5
 Description="<html>The position of arithmetic operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_arith=ignore|pos_arith=break|pos_arith=force|pos_arith=lead|pos_arith=trail|pos_arith=join|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail_break|pos_arith=trail_force
+Choices="pos_arith=ignore|pos_arith=lead|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail|pos_arith=trail_break|pos_arith=trail_force"
 ChoicesReadable="Ignore Pos Arith|Lead Pos Arith|Lead Break Pos Arith|Lead Force Pos Arith|Trail Pos Arith|Trail Break Pos Arith|Trail Force Pos Arith"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Assign]
 Category=5
-Description="<html>The position of assignment in wrapped expressions. Do not affect '='<br/>followed by '{'.</html>"
+Description="<html>The position of assignment in wrapped expressions.<BR>Do not affect '=' followed by '{'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_assign=ignore|pos_assign=break|pos_assign=force|pos_assign=lead|pos_assign=trail|pos_assign=join|pos_assign=lead_break|pos_assign=lead_force|pos_assign=trail_break|pos_assign=trail_force
+Choices="pos_assign=ignore|pos_assign=lead|pos_assign=lead_break|pos_assign=lead_force|pos_assign=trail|pos_assign=trail_break|pos_assign=trail_force"
 ChoicesReadable="Ignore Pos Assign|Lead Pos Assign|Lead Break Pos Assign|Lead Force Pos Assign|Trail Pos Assign|Trail Break Pos Assign|Trail Force Pos Assign"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Bool]
 Category=5
-Description="<html>The position of Boolean operators in wrapped expressions.</html>"
+Description="<html>The position of boolean operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_bool=ignore|pos_bool=break|pos_bool=force|pos_bool=lead|pos_bool=trail|pos_bool=join|pos_bool=lead_break|pos_bool=lead_force|pos_bool=trail_break|pos_bool=trail_force
+Choices="pos_bool=ignore|pos_bool=lead|pos_bool=lead_break|pos_bool=lead_force|pos_bool=trail|pos_bool=trail_break|pos_bool=trail_force"
 ChoicesReadable="Ignore Pos Bool|Lead Pos Bool|Lead Break Pos Bool|Lead Force Pos Bool|Trail Pos Bool|Trail Break Pos Bool|Trail Force Pos Bool"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Compare]
 Category=5
 Description="<html>The position of comparison operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_compare=ignore|pos_compare=break|pos_compare=force|pos_compare=lead|pos_compare=trail|pos_compare=join|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail_break|pos_compare=trail_force
+Choices="pos_compare=ignore|pos_compare=lead|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail|pos_compare=trail_break|pos_compare=trail_force"
 ChoicesReadable="Ignore Pos Compare|Lead Pos Compare|Lead Break Pos Compare|Lead Force Pos Compare|Trail Pos Compare|Trail Break Pos Compare|Trail Force Pos Compare"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Conditional]
 Category=5
-Description="<html>The position of conditional operators, as in the '?' and ':' of<br/>'expr ? stmt : stmt', in wrapped expressions.</html>"
+Description="<html>The position of conditional (b ? t : f) operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_conditional=ignore|pos_conditional=break|pos_conditional=force|pos_conditional=lead|pos_conditional=trail|pos_conditional=join|pos_conditional=lead_break|pos_conditional=lead_force|pos_conditional=trail_break|pos_conditional=trail_force
+Choices="pos_conditional=ignore|pos_conditional=lead|pos_conditional=lead_break|pos_conditional=lead_force|pos_conditional=trail|pos_conditional=trail_break|pos_conditional=trail_force"
 ChoicesReadable="Ignore Pos Conditional|Lead Pos Conditional|Lead Break Pos Conditional|Lead Force Pos Conditional|Trail Pos Conditional|Trail Break Pos Conditional|Trail Force Pos Conditional"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Comma]
 Category=5
 Description="<html>The position of the comma in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_comma=ignore|pos_comma=break|pos_comma=force|pos_comma=lead|pos_comma=trail|pos_comma=join|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail_break|pos_comma=trail_force
+Choices="pos_comma=ignore|pos_comma=lead|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail|pos_comma=trail_break|pos_comma=trail_force"
 ChoicesReadable="Ignore Pos Comma|Lead Pos Comma|Lead Break Pos Comma|Lead Force Pos Comma|Trail Pos Comma|Trail Break Pos Comma|Trail Force Pos Comma"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Enum Comma]
 Category=5
 Description="<html>The position of the comma in enum entries.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_enum_comma=ignore|pos_enum_comma=break|pos_enum_comma=force|pos_enum_comma=lead|pos_enum_comma=trail|pos_enum_comma=join|pos_enum_comma=lead_break|pos_enum_comma=lead_force|pos_enum_comma=trail_break|pos_enum_comma=trail_force
+Choices="pos_enum_comma=ignore|pos_enum_comma=lead|pos_enum_comma=lead_break|pos_enum_comma=lead_force|pos_enum_comma=trail|pos_enum_comma=trail_break|pos_enum_comma=trail_force"
 ChoicesReadable="Ignore Pos Enum Comma|Lead Pos Enum Comma|Lead Break Pos Enum Comma|Lead Force Pos Enum Comma|Trail Pos Enum Comma|Trail Break Pos Enum Comma|Trail Force Pos Enum Comma"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Class Comma]
 Category=5
-Description="<html>The position of the comma in the base class list if there is more than one<br/>line. Affects nl_class_init_args.</html>"
+Description="<html>The position of the comma in the base class list if there are more than one line,<BR>  (tied to nl_class_init_args).</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_class_comma=ignore|pos_class_comma=break|pos_class_comma=force|pos_class_comma=lead|pos_class_comma=trail|pos_class_comma=join|pos_class_comma=lead_break|pos_class_comma=lead_force|pos_class_comma=trail_break|pos_class_comma=trail_force
+Choices="pos_class_comma=ignore|pos_class_comma=lead|pos_class_comma=lead_break|pos_class_comma=lead_force|pos_class_comma=trail|pos_class_comma=trail_break|pos_class_comma=trail_force"
 ChoicesReadable="Ignore Pos Class Comma|Lead Pos Class Comma|Lead Break Pos Class Comma|Lead Force Pos Class Comma|Trail Pos Class Comma|Trail Break Pos Class Comma|Trail Force Pos Class Comma"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Constr Comma]
 Category=5
-Description="<html>The position of the comma in the constructor initialization list.<br/>Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.</html>"
+Description="<html>The position of the comma in the constructor initialization list.<BR>Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_constr_comma=ignore|pos_constr_comma=break|pos_constr_comma=force|pos_constr_comma=lead|pos_constr_comma=trail|pos_constr_comma=join|pos_constr_comma=lead_break|pos_constr_comma=lead_force|pos_constr_comma=trail_break|pos_constr_comma=trail_force
+Choices="pos_constr_comma=ignore|pos_constr_comma=lead|pos_constr_comma=lead_break|pos_constr_comma=lead_force|pos_constr_comma=trail|pos_constr_comma=trail_break|pos_constr_comma=trail_force"
 ChoicesReadable="Ignore Pos Constr Comma|Lead Pos Constr Comma|Lead Break Pos Constr Comma|Lead Force Pos Constr Comma|Trail Pos Constr Comma|Trail Break Pos Constr Comma|Trail Force Pos Constr Comma"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Class Colon]
 Category=5
-Description="<html>The position of trailing/leading class colon, between class and base class<br/>list. Affects nl_class_colon.</html>"
+Description="<html>The position of trailing/leading class colon, between class and base class list<BR>  (tied to nl_class_colon).</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_class_colon=ignore|pos_class_colon=break|pos_class_colon=force|pos_class_colon=lead|pos_class_colon=trail|pos_class_colon=join|pos_class_colon=lead_break|pos_class_colon=lead_force|pos_class_colon=trail_break|pos_class_colon=trail_force
+Choices="pos_class_colon=ignore|pos_class_colon=lead|pos_class_colon=lead_break|pos_class_colon=lead_force|pos_class_colon=trail|pos_class_colon=trail_break|pos_class_colon=trail_force"
 ChoicesReadable="Ignore Pos Class Colon|Lead Pos Class Colon|Lead Break Pos Class Colon|Lead Force Pos Class Colon|Trail Pos Class Colon|Trail Break Pos Class Colon|Trail Force Pos Class Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pos Constr Colon]
 Category=5
-Description="<html>The position of colons between constructor and member initialization.<br/>Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.</html>"
+Description="<html>The position of colons between constructor and member initialization,<BR>(tied to nl_constr_colon).<BR>Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_constr_colon=ignore|pos_constr_colon=break|pos_constr_colon=force|pos_constr_colon=lead|pos_constr_colon=trail|pos_constr_colon=join|pos_constr_colon=lead_break|pos_constr_colon=lead_force|pos_constr_colon=trail_break|pos_constr_colon=trail_force
+Choices="pos_constr_colon=ignore|pos_constr_colon=lead|pos_constr_colon=lead_break|pos_constr_colon=lead_force|pos_constr_colon=trail|pos_constr_colon=trail_break|pos_constr_colon=trail_force"
 ChoicesReadable="Ignore Pos Constr Colon|Lead Pos Constr Colon|Lead Break Pos Constr Colon|Lead Force Pos Constr Colon|Trail Pos Constr Colon|Trail Break Pos Constr Colon|Trail Force Pos Constr Colon"
-ValueDefault=ignore
+ValueDefault=0
 
 [Code Width]
 Category=6
-Description="<html>Try to limit code width to N columns.</html>"
+Description="<html>Try to limit code width to N number of columns</html>"
 Enabled=false
 EditorType=numeric
 CallName="code_width="
@@ -4570,23 +4453,23 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=ls_for_split_full=true|ls_for_split_full=false
-ValueDefault=false
+ValueDefault=0
 
 [Ls Func Split Full]
 Category=6
-Description="<html>Whether to fully split long function prototypes/calls at commas.</html>"
+Description="<html>Whether to fully split long function protos/calls at commas.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=ls_func_split_full=true|ls_func_split_full=false
-ValueDefault=false
+ValueDefault=0
 
 [Ls Code Width]
 Category=6
-Description="<html>Whether to split lines as close to code_width as possible and ignore some<br/>groupings.</html>"
+Description="<html>Whether to split lines as close to code_width as possible and ignore some groupings.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=ls_code_width=true|ls_code_width=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Keep Tabs]
 Category=7
@@ -4594,7 +4477,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_keep_tabs=true|align_keep_tabs=false
-ValueDefault=false
+ValueDefault=0
 
 [Align With Tabs]
 Category=7
@@ -4602,7 +4485,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_with_tabs=true|align_with_tabs=false
-ValueDefault=false
+ValueDefault=0
 
 [Align On Tabstop]
 Category=7
@@ -4610,7 +4493,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_on_tabstop=true|align_on_tabstop=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Number Right]
 Category=7
@@ -4618,7 +4501,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_number_right=true|align_number_right=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Keep Extra Space]
 Category=7
@@ -4626,19 +4509,19 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_keep_extra_space=true|align_keep_extra_space=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Func Params]
 Category=7
-Description="<html>Whether to align variable definitions in prototypes and functions.</html>"
+Description="<html>Align variable definitions in prototypes and functions.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_func_params=true|align_func_params=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Func Params Span]
 Category=7
-Description="<html>The span for aligning parameter definitions in function on parameter name.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning parameter definitions in function on parameter name (0=don't align).</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_func_params_span="
@@ -4648,7 +4531,7 @@
 
 [Align Func Params Thresh]
 Category=7
-Description="<html>The threshold for aligning function parameter definitions.<br/><br/>0 = No limit (default).</html>"
+Description="<html>The threshold for aligning function parameter definitions (0=no limit).</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_func_params_thresh="
@@ -4668,15 +4551,15 @@
 
 [Align Same Func Call Params]
 Category=7
-Description="<html>Whether to align parameters in single-line functions that have the same<br/>name. The function names must already be aligned with each other.</html>"
+Description="<html>Align parameters in single-line functions that have the same name.<BR>The function names must already be aligned with each other.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_same_func_call_params=true|align_same_func_call_params=false
-ValueDefault=false
+ValueDefault=0
 
-[Align Same Func Call Params Span]
+[Same Func Call Param Alignment Span]
 Category=7
-Description="<html>The span for aligning function-call parameters for single line functions.<br/><br/>0 = Don't align (default).</html>"
+Description=="<html> Span for aligning parameters in single-line functions that have the same name.<BR>The function names must already be aligned with each other.</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_same_func_call_params_span="
@@ -4684,9 +4567,9 @@
 MaxVal=5000
 ValueDefault=0
 
-[Align Same Func Call Params Thresh]
+[Same Func Call Param Alignment Thresh]
 Category=7
-Description="<html>The threshold for aligning function-call parameters for single line<br/>functions.<br/><br/>0 = No limit (default).</html>"
+Description=="<html> Threshold for aligning parameters in single-line functions that have the same name.<BR>The function names must already be aligned with each other.</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_same_func_call_params_thresh="
@@ -4696,7 +4579,7 @@
 
 [Align Var Def Span]
 Category=7
-Description="<html>The span for aligning variable definitions.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning variable definitions (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_def_span="
@@ -4706,7 +4589,7 @@
 
 [Align Var Def Star Style]
 Category=7
-Description="<html>How to align the '*' in variable definitions.<br/><br/>0: Part of the type     'void *   foo;' (default)<br/>1: Part of the variable 'void     *foo;'<br/>2: Dangling             'void    *foo;'</html>"
+Description="<html>How to align the star in variable definitions.<BR> 0=Part of the type     'void *   foo;'<BR> 1=Part of the variable 'void     *foo;'<BR> 2=Dangling             'void    *foo;'</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_def_star_style="
@@ -4716,7 +4599,7 @@
 
 [Align Var Def Amp Style]
 Category=7
-Description="<html>How to align the '&amp;' in variable definitions.<br/><br/>0: Part of the type     'long &amp;   foo;' (default)<br/>1: Part of the variable 'long     &amp;foo;'<br/>2: Dangling             'long    &amp;foo;'</html>"
+Description="<html>How to align the '&amp;' in variable definitions.<BR> 0=Part of the type<BR> 1=Part of the variable<BR> 2=Dangling</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_def_amp_style="
@@ -4726,7 +4609,7 @@
 
 [Align Var Def Thresh]
 Category=7
-Description="<html>The threshold for aligning variable definitions.<br/><br/>0 = No limit (default).</html>"
+Description="<html>The threshold for aligning variable definitions (0=no limit)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_def_thresh="
@@ -4750,11 +4633,11 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_var_def_colon=true|align_var_def_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Var Def Colon Gap]
 Category=7
-Description="<html>The gap for aligning the colon in struct bit fields.</html>"
+Description="<html>align variable defs gap for bit colons.</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_def_colon_gap="
@@ -4768,7 +4651,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_var_def_attribute=true|align_var_def_attribute=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Var Def Inline]
 Category=7
@@ -4776,11 +4659,11 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=align_var_def_inline=true|align_var_def_inline=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Assign Span]
 Category=7
-Description="<html>The span for aligning on '=' in assignments.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning on '=' in assignments (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_assign_span="
@@ -4790,7 +4673,7 @@
 
 [Align Assign Thresh]
 Category=7
-Description="<html>The threshold for aligning on '=' in assignments.<br/><br/>0 = No limit (default).</html>"
+Description="<html>The threshold for aligning on '=' in assignments (0=no limit)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_assign_thresh="
@@ -4798,19 +4681,9 @@
 MaxVal=5000
 ValueDefault=0
 
-[Align Assign Decl Func]
-Category=7
-Description="<html>How to apply align_assign_span to function declaration "assignments", i.e.<br/>'virtual void foo() = 0' or '~foo() = {default|delete}'.<br/><br/>0: Align with other assignments (default)<br/>1: Align with each other, ignoring regular assignments<br/>2: Don't align</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_decl_func="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
 [Align Enum Equ Span]
 Category=7
-Description="<html>The span for aligning on '=' in enums.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning on '=' in enums (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_enum_equ_span="
@@ -4820,7 +4693,7 @@
 
 [Align Enum Equ Thresh]
 Category=7
-Description="<html>The threshold for aligning on '=' in enums.<br/><br/>0 = no limit (default).</html>"
+Description="<html>The threshold for aligning on '=' in enums (0=no limit)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_enum_equ_thresh="
@@ -4830,7 +4703,7 @@
 
 [Align Var Class Span]
 Category=7
-Description="<html>The span for aligning class member definitions.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning class (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_class_span="
@@ -4840,7 +4713,7 @@
 
 [Align Var Class Thresh]
 Category=7
-Description="<html>The threshold for aligning class member definitions.<br/><br/>0 = No limit (default).</html>"
+Description="<html>The threshold for aligning class member definitions (0=no limit).</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_class_thresh="
@@ -4860,7 +4733,7 @@
 
 [Align Var Struct Span]
 Category=7
-Description="<html>The span for aligning struct/union member definitions.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning struct/union (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_struct_span="
@@ -4870,7 +4743,7 @@
 
 [Align Var Struct Thresh]
 Category=7
-Description="<html>The threshold for aligning struct/union member definitions.<br/><br/>0 = No limit (default).</html>"
+Description="<html>The threshold for aligning struct/union member definitions (0=no limit)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_var_struct_thresh="
@@ -4890,7 +4763,7 @@
 
 [Align Struct Init Span]
 Category=7
-Description="<html>The span for aligning struct initializer values.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning struct initializer values (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_struct_init_span="
@@ -4910,7 +4783,7 @@
 
 [Align Typedef Span]
 Category=7
-Description="<html>The span for aligning single-line typedefs.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning single-line typedefs (0=don't align).</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_typedef_span="
@@ -4920,7 +4793,7 @@
 
 [Align Typedef Func]
 Category=7
-Description="<html>How to align typedef'd functions with other typedefs.<br/><br/>0: Don't mix them at all (default)<br/>1: Align the open parenthesis with the types<br/>2: Align the function type name with the other type names</html>"
+Description="<html>How to align typedef'd functions with other typedefs<BR>0: Don't mix them at all<BR>1: align the open paren with the types<BR>2: align the function type name with the other type names</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_typedef_func="
@@ -4930,7 +4803,7 @@
 
 [Align Typedef Star Style]
 Category=7
-Description="<html>How to align the '*' in typedefs.<br/><br/>0: Align on typedef type, ignore '*' (default)<br/>1: The '*' is part of type name: 'typedef int  *pint;'<br/>2: The '*' is part of the type, but dangling: 'typedef int *pint;'</html>"
+Description="<html>Controls the positioning of the '*' in typedefs. Just try it.<BR>0: Align on typedef type, ignore '*'<BR>1: The '*' is part of type name: typedef int  *pint;<BR>2: The '*' is part of the type, but dangling: typedef int *pint;</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_typedef_star_style="
@@ -4940,7 +4813,7 @@
 
 [Align Typedef Amp Style]
 Category=7
-Description="<html>How to align the '&amp;' in typedefs.<br/><br/>0: Align on typedef type, ignore '&amp;' (default)<br/>1: The '&amp;' is part of type name: 'typedef int  &amp;pint;'<br/>2: The '&amp;' is part of the type, but dangling: 'typedef int &amp;pint;'</html>"
+Description="<html>Controls the positioning of the '&amp;' in typedefs. Just try it.<BR>0: Align on typedef type, ignore '&amp;'<BR>1: The '&amp;' is part of type name: typedef int  &amp;pint;<BR>2: The '&amp;' is part of the type, but dangling: typedef int &amp;pint;</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_typedef_amp_style="
@@ -4950,7 +4823,7 @@
 
 [Align Right Cmt Span]
 Category=7
-Description="<html>The span for aligning comments that end lines.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning comments that end lines (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_right_cmt_span="
@@ -4960,23 +4833,15 @@
 
 [Align Right Cmt Mix]
 Category=7
-Description="<html>If aligning comments, whether to mix with comments after '}' and #endif with<br/>less than three spaces before the comment.</html>"
+Description="<html>If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_right_cmt_mix=true|align_right_cmt_mix=false
-ValueDefault=false
-
-[Align Right Cmt Same Level]
-Category=7
-Description="<html>Whether to only align trailing comments that are at the same brace level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_right_cmt_same_level=true|align_right_cmt_same_level=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Right Cmt Gap]
 Category=7
-Description="<html>Minimum number of columns between preceding text and a trailing comment in<br/>order for the comment to qualify for being aligned. Must be non-zero to have<br/>an effect.</html>"
+Description="<html>If a trailing comment is more than this number of columns away from the text it follows,<BR>it will qualify for being aligned. This has to be &gt; 0 to do anything.</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_right_cmt_gap="
@@ -4986,7 +4851,7 @@
 
 [Align Right Cmt At Col]
 Category=7
-Description="<html>Minimum column at which to align trailing comments. Comments which are<br/>aligned beyond this column, but which can be aligned in a lesser column,<br/>may be "pulled in".<br/><br/>0 = Ignore (default).</html>"
+Description="<html>Align trailing comment at or beyond column N; 'pulls in' comments as a bonus side effect (0=ignore)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_right_cmt_at_col="
@@ -4996,7 +4861,7 @@
 
 [Align Func Proto Span]
 Category=7
-Description="<html>The span for aligning function prototypes.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning function prototypes (0=don't align).</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_func_proto_span="
@@ -5016,35 +4881,35 @@
 
 [Align On Operator]
 Category=7
-Description="<html>Whether to align function prototypes on the 'operator' keyword instead of<br/>what follows.</html>"
+Description="<html>Align function protos on the 'operator' keyword instead of what follows.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_on_operator=true|align_on_operator=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Mix Var Proto]
 Category=7
-Description="<html>Whether to mix aligning prototype and variable declarations. If true,<br/>align_var_def_XXX options are used instead of align_func_proto_XXX options.</html>"
+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>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_mix_var_proto=true|align_mix_var_proto=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Single Line Func]
 Category=7
-Description="<html>Whether to align single-line functions with function prototypes.<br/>Uses align_func_proto_span.</html>"
+Description="<html>Align single-line functions with function prototypes, uses align_func_proto_span.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_single_line_func=true|align_single_line_func=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Single Line Brace]
 Category=7
-Description="<html>Whether to align the open brace of single-line functions.<br/>Requires align_single_line_func=true. Uses align_func_proto_span.</html>"
+Description="<html>Aligning the open brace of single-line functions.<BR>Requires align_single_line_func=True, uses align_func_proto_span.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_single_line_brace=true|align_single_line_brace=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Single Line Brace Gap]
 Category=7
@@ -5058,7 +4923,7 @@
 
 [Align Oc Msg Spec Span]
 Category=7
-Description="<html>(OC) The span for aligning Objective-C message specifications.<br/><br/>0 = Don't align (default).</html>"
+Description="<html>The span for aligning ObjC msg spec (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_oc_msg_spec_span="
@@ -5068,19 +4933,19 @@
 
 [Align Nl Cont]
 Category=7
-Description="<html>Whether to align macros wrapped with a backslash and a newline. This will<br/>not work right if the macro contains a multi-line comment.</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>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_nl_cont=true|align_nl_cont=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Pp Define Together]
 Category=7
-Description="<html>Whether to align macro functions and variables together.</html>"
+Description="<html># Align macro functions and variables together.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_pp_define_together=true|align_pp_define_together=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Pp Define Gap]
 Category=7
@@ -5094,7 +4959,7 @@
 
 [Align Pp Define Span]
 Category=7
-Description="<html>The span for aligning on '#define' bodies.<br/><br/>=0: Don't align (default)<br/>&gt;0: Number of lines (including comments) between blocks</html>"
+Description="<html>The span for aligning on '#define' bodies (0=don't align, other=number of lines including comments between blocks)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_pp_define_span="
@@ -5104,23 +4969,23 @@
 
 [Align Left Shift]
 Category=7
-Description="<html>Whether to align lines that start with '&lt;&lt;' with previous '&lt;&lt;'.<br/><br/>Default: true</html>"
+Description="<html>Align lines that start with '&lt;&lt;' with previous '&lt;&lt;'. Default=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_left_shift=true|align_left_shift=false
-ValueDefault=true
+ValueDefault=1
 
 [Align Asm Colon]
 Category=7
-Description="<html>Whether to align text after 'asm volatile ()' colons.</html>"
+Description="<html>Align text after asm volatile () colons.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_asm_colon=true|align_asm_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Oc Msg Colon Span]
 Category=7
-Description="<html>(OC) Span for aligning parameters in an Objective-C message call<br/>on the ':'.<br/><br/>0 = Don't align.</html>"
+Description="<html>Span for aligning parameters in an Obj-C message call on the ':' (0=don't align)</html>"
 Enabled=false
 EditorType=numeric
 CallName="align_oc_msg_colon_span="
@@ -5130,23 +4995,23 @@
 
 [Align Oc Msg Colon First]
 Category=7
-Description="<html>(OC) Whether to always align with the first parameter, even if it is too<br/>short.</html>"
+Description="<html>If True, always align with the first parameter, even if it is too short.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_oc_msg_colon_first=true|align_oc_msg_colon_first=false
-ValueDefault=false
+ValueDefault=0
 
 [Align Oc Decl Colon]
 Category=7
-Description="<html>(OC) Whether to align parameters in an Objective-C '+' or '-' declaration<br/>on the ':'.</html>"
+Description="<html>Aligning parameters in an Obj-C '+' or '-' declaration on the ':'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_oc_decl_colon=true|align_oc_decl_colon=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt Width]
 Category=8
-Description="<html>Try to wrap comments at N columns.</html>"
+Description="<html>Try to wrap comments at cmt_width columns</html>"
 Enabled=false
 EditorType=numeric
 CallName="cmt_width="
@@ -5156,7 +5021,7 @@
 
 [Cmt Reflow Mode]
 Category=8
-Description="<html>How to reflow comments.<br/><br/>0: No reflowing (apart from the line wrapping due to cmt_width) (default)<br/>1: No touching at all<br/>2: Full reflow</html>"
+Description="<html>Set the comment reflow mode (Default=0)<BR>0: no reflowing (apart from the line wrapping due to cmt_width)<BR>1: no touching at all<BR>2: full reflow</html>"
 Enabled=false
 EditorType=numeric
 CallName="cmt_reflow_mode="
@@ -5166,19 +5031,19 @@
 
 [Cmt Convert Tab To Spaces]
 Category=8
-Description="<html>Whether to convert all tabs to spaces in comments. If false, tabs in<br/>comments are left alone, unless used for indenting.</html>"
+Description="<html>Whether to convert all tabs to spaces in comments. Default is to leave tabs inside comments alone, unless used for indenting.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_convert_tab_to_spaces=true|cmt_convert_tab_to_spaces=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt Indent Multi]
 Category=8
-Description="<html>Whether to apply changes to multi-line comments, including cmt_width,<br/>keyword substitution and leading chars.<br/><br/>Default: true</html>"
+Description="<html>If False, disable all multi-line comment changes, including cmt_width. keyword substitution and leading chars.<BR>Default=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false
-ValueDefault=true
+ValueDefault=1
 
 [Cmt C Group]
 Category=8
@@ -5186,7 +5051,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_c_group=true|cmt_c_group=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt C Nl Start]
 Category=8
@@ -5194,47 +5059,47 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_c_nl_start=true|cmt_c_nl_start=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt C Nl End]
 Category=8
-Description="<html>Whether to add a newline before the closing '*/' of the combined c-comment.</html>"
+Description="<html>Whether to put a newline before the closing '*/' of the combined c-comment.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_c_nl_end=true|cmt_c_nl_end=false
-ValueDefault=false
-
-[Cmt Cpp To C]
-Category=8
-Description="<html>Whether to change cpp-comments into c-comments.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_to_c=true|cmt_cpp_to_c=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt Cpp Group]
 Category=8
-Description="<html>Whether to group cpp-comments that look like they are in a block. Only<br/>meaningful if cmt_cpp_to_c=true.</html>"
+Description="<html>Whether to group cpp-comments that look like they are in a block.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_cpp_group=true|cmt_cpp_group=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt Cpp Nl Start]
 Category=8
-Description="<html>Whether to put an empty '/*' on the first line of the combined cpp-comment<br/>when converting to a c-comment.<br/><br/>Requires cmt_cpp_to_c=true and cmt_cpp_group=true.</html>"
+Description="<html>Whether to put an empty '/*' on the first line of the combined cpp-comment.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_cpp_nl_start=true|cmt_cpp_nl_start=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt Cpp Nl End]
 Category=8
-Description="<html>Whether to add a newline before the closing '*/' of the combined cpp-comment<br/>when converting to a c-comment.<br/><br/>Requires cmt_cpp_to_c=true and cmt_cpp_group=true.</html>"
+Description="<html>Whether to put a newline before the closing '*/' of the combined cpp-comment.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_cpp_nl_end=true|cmt_cpp_nl_end=false
-ValueDefault=false
+ValueDefault=0
+
+[Cmt Cpp To C]
+Category=8
+Description="<html>Whether to change cpp-comments into c-comments.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_cpp_to_c=true|cmt_cpp_to_c=false
+ValueDefault=0
 
 [Cmt Star Cont]
 Category=8
@@ -5242,7 +5107,7 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_star_cont=true|cmt_star_cont=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt Sp Before Star Cont]
 Category=8
@@ -5266,15 +5131,15 @@
 
 [Cmt Multi Check Last]
 Category=8
-Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first<br/>and last lines of the comment are the same length.<br/><br/>Default: true</html>"
+Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of<BR>the comment are the same length. Default=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_multi_check_last=true|cmt_multi_check_last=false
-ValueDefault=true
+ValueDefault=1
 
 [Cmt Multi First Len Minimum]
 Category=8
-Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first<br/>and last lines of the comment are the same length AND if the length is<br/>bigger as the first_len minimum.<br/><br/>Default: 4</html>"
+Description="<html>For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of<BR>the comment are the same length AND if the length is bigger as the first_len minimum. Default=4</html>"
 Enabled=false
 EditorType=numeric
 CallName="cmt_multi_first_len_minimum="
@@ -5284,7 +5149,7 @@
 
 [Cmt Insert File Header]
 Category=8
-Description="<html>Path to a file that contains text to insert at the beginning of a file if<br/>the file doesn't start with a C/C++ comment. If the inserted text contains<br/>'$(filename)', that will be replaced with the current file's name.</html>"
+Description="<html>The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.<BR>Will substitute $(filename) with the current file's name.</html>"
 Enabled=false
 CallName=cmt_insert_file_header=
 EditorType=string
@@ -5292,7 +5157,7 @@
 
 [Cmt Insert File Footer]
 Category=8
-Description="<html>Path to a file that contains text to insert at the end of a file if the<br/>file doesn't end with a C/C++ comment. If the inserted text contains<br/>'$(filename)', that will be replaced with the current file's name.</html>"
+Description="<html>The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment.<BR>Will substitute $(filename) with the current file's name.</html>"
 Enabled=false
 CallName=cmt_insert_file_footer=
 EditorType=string
@@ -5300,7 +5165,7 @@
 
 [Cmt Insert Func Header]
 Category=8
-Description="<html>Path to a file that contains text to insert before a function definition if<br/>the function isn't preceded by a C/C++ comment. If the inserted text<br/>contains '$(function)', '$(javaparam)' or '$(fclass)', these will be<br/>replaced with, respectively, the name of the function, the javadoc '@param'<br/>and '@return' stuff, or the name of the class to which the member function<br/>belongs.</html>"
+Description="<html>The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment.<BR>Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.<BR>Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }.</html>"
 Enabled=false
 CallName=cmt_insert_func_header=
 EditorType=string
@@ -5308,7 +5173,7 @@
 
 [Cmt Insert Class Header]
 Category=8
-Description="<html>Path to a file that contains text to insert before a class if the class<br/>isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',<br/>that will be replaced with the class name.</html>"
+Description="<html>The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment.<BR>Will substitute $(class) with the class name.</html>"
 Enabled=false
 CallName=cmt_insert_class_header=
 EditorType=string
@@ -5316,7 +5181,7 @@
 
 [Cmt Insert Oc Msg Header]
 Category=8
-Description="<html>Path to a file that contains text to insert before an Objective-C message<br/>specification, if the method isn't preceded by a C/C++ comment. If the<br/>inserted text contains '$(message)' or '$(javaparam)', these will be<br/>replaced with, respectively, the name of the function, or the javadoc<br/>'@param' and '@return' stuff.</html>"
+Description="<html>The filename that contains text to insert before a Obj-C message specification if the method isn't preceded with a C/C++ comment.<BR>Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.</html>"
 Enabled=false
 CallName=cmt_insert_oc_msg_header=
 EditorType=string
@@ -5324,97 +5189,79 @@
 
 [Cmt Insert Before Preproc]
 Category=8
-Description="<html>Whether a comment should be inserted if a preprocessor is encountered when<br/>stepping backwards from a function name.<br/><br/>Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and<br/>cmt_insert_class_header.</html>"
+Description="<html>If a preprocessor is encountered when stepping backwards from a function name, then<BR>this option decides whether the comment should be inserted.<BR>Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_insert_before_preproc=true|cmt_insert_before_preproc=false
-ValueDefault=false
+ValueDefault=0
 
 [Cmt Insert Before Inlines]
 Category=8
-Description="<html>Whether a comment should be inserted if a function is declared inline to a<br/>class definition.<br/><br/>Applies to cmt_insert_func_header.<br/><br/>Default: true</html>"
+Description="<html>If a function is declared inline to a class definition, then<BR>this option decides whether the comment should be inserted.<BR>Affects cmt_insert_func_header.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_insert_before_inlines=true|cmt_insert_before_inlines=false
-ValueDefault=true
+ValueDefault=1
 
 [Cmt Insert Before Ctor Dtor]
 Category=8
-Description="<html>Whether a comment should be inserted if the function is a class constructor<br/>or destructor.<br/><br/>Applies to cmt_insert_func_header.</html>"
+Description="<html>If the function is a constructor/destructor, then<BR>this option decides whether the comment should be inserted.<BR>Affects cmt_insert_func_header.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_insert_before_ctor_dtor=true|cmt_insert_before_ctor_dtor=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Full Brace Do]
 Category=9
-Description="<html>Add or remove braces on a single-line 'do' statement.</html>"
+Description="<html>Add or remove braces on single-line 'do' statement.</html>"
 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"
 ChoicesReadable="Ignore Mod Full Brace Do|Add Mod Full Brace Do|Remove Mod Full Brace Do|Force Mod Full Brace Do"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Full Brace For]
 Category=9
-Description="<html>Add or remove braces on a single-line 'for' statement.</html>"
+Description="<html>Add or remove braces on single-line 'for' statement.</html>"
 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"
 ChoicesReadable="Ignore Mod Full Brace For|Add Mod Full Brace For|Remove Mod Full Brace For|Force Mod Full Brace For"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Full Brace Function]
 Category=9
-Description="<html>(Pawn) Add or remove braces on a single-line function definition.</html>"
+Description="<html>Add or remove braces on single-line function definitions. (Pawn).</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force
+Choices="mod_full_brace_function=ignore|mod_full_brace_function=add|mod_full_brace_function=remove|mod_full_brace_function=force"
 ChoicesReadable="Ignore Mod Full Brace Function|Add Mod Full Brace Function|Remove Mod Full Brace Function|Force Mod Full Brace Function"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Full Brace If]
 Category=9
-Description="<html>Add or remove braces on a single-line 'if' statement. Braces will not be<br/>removed if the braced statement contains an 'else'.</html>"
+Description="<html>Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.</html>"
 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"
 ChoicesReadable="Ignore Mod Full Brace If|Add Mod Full Brace If|Remove Mod Full Brace If|Force Mod Full Brace If"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Full Brace If Chain]
 Category=9
-Description="<html>Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either<br/>have, or do not have, braces. If true, braces will be added if any block<br/>needs braces, and will only be removed if they can be removed from all<br/>blocks.<br/><br/>Overrides mod_full_brace_if.</html>"
+Description="<html>Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.<BR>If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Full Brace If Chain Only]
 Category=9
-Description="<html>Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.<br/>If true, mod_full_brace_if_chain will only remove braces from an 'if' that<br/>does not have an 'else if' or 'else'.</html>"
+Description="<html>Make all if/elseif/else statements with at least one 'else' or 'else if' fully braced.<BR>If mod_full_brace_if_chain is used together with this option, all if-else chains will get braces,<BR>and simple 'if' statements will lose them (if possible).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_full_brace_if_chain_only=true|mod_full_brace_if_chain_only=false
-ValueDefault=false
-
-[Mod Full Brace While]
-Category=9
-Description="<html>Add or remove braces on single-line 'while' statement.</html>"
-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
-ChoicesReadable="Ignore Mod Full Brace While|Add Mod Full Brace While|Remove Mod Full Brace While|Force Mod Full Brace While"
-ValueDefault=ignore
-
-[Mod Full Brace Using]
-Category=9
-Description="<html>Add or remove braces on single-line 'using ()' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_full_brace_using=ignore|mod_full_brace_using=add|mod_full_brace_using=remove|mod_full_brace_using=force
-ChoicesReadable="Ignore Mod Full Brace Using|Add Mod Full Brace Using|Remove Mod Full Brace Using|Force Mod Full Brace Using"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Full Brace Nl]
 Category=9
@@ -5428,36 +5275,54 @@
 
 [Mod Full Brace Nl Block Rem Mlcond]
 Category=9
-Description="<html>Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks<br/>which span multiple lines.<br/><br/>Affects:<br/>  mod_full_brace_for<br/>  mod_full_brace_if<br/>  mod_full_brace_if_chain<br/>  mod_full_brace_if_chain_only<br/>  mod_full_brace_while<br/>  mod_full_brace_using<br/><br/>Does not affect:<br/>  mod_full_brace_do<br/>  mod_full_brace_function</html>"
+Description="<html>Blocks removal of braces if the parenthesis of if/for/while/.. span multiple lines.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_full_brace_nl_block_rem_mlcond=true|mod_full_brace_nl_block_rem_mlcond=false
-ValueDefault=false
+ValueDefault=0
+
+[Mod Full Brace While]
+Category=9
+Description="<html>Add or remove braces on single-line 'while' statement.</html>"
+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"
+ChoicesReadable="Ignore Mod Full Brace While|Add Mod Full Brace While|Remove Mod Full Brace While|Force Mod Full Brace While"
+ValueDefault=0
+
+[Mod Full Brace Using]
+Category=9
+Description="<html>Add or remove braces on single-line 'using ()' statement.</html>"
+Enabled=false
+EditorType=multiple
+Choices="mod_full_brace_using=ignore|mod_full_brace_using=add|mod_full_brace_using=remove|mod_full_brace_using=force"
+ChoicesReadable="Ignore Mod Full Brace Using|Add Mod Full Brace Using|Remove Mod Full Brace Using|Force Mod Full Brace Using"
+ValueDefault=0
 
 [Mod Paren On Return]
 Category=9
-Description="<html>Add or remove unnecessary parenthesis on 'return' statement.</html>"
+Description="<html>Add or remove unnecessary paren on 'return' statement.</html>"
 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"
 ChoicesReadable="Ignore Mod Paren On Return|Add Mod Paren On Return|Remove Mod Paren On Return|Force Mod Paren On Return"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Pawn Semicolon]
 Category=9
-Description="<html>(Pawn) Whether to change optional semicolons to real semicolons.</html>"
+Description="<html>Whether to change optional semicolons to real semicolons.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_pawn_semicolon=true|mod_pawn_semicolon=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Full Paren If Bool]
 Category=9
-Description="<html>Whether to fully parenthesize Boolean expressions in 'while' and 'if'<br/>statement, as in 'if (a &amp;&amp; b &gt; c)' → 'if (a &amp;&amp; (b &gt; c))'.</html>"
+Description="<html>Add parens on 'while' and 'if' statement around bools.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Remove Extra Semicolon]
 Category=9
@@ -5465,21 +5330,21 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_remove_extra_semicolon=true|mod_remove_extra_semicolon=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Add Long Function Closebrace Comment]
 Category=9
-Description="<html>If a function body exceeds the specified number of newlines and doesn't have<br/>a comment after the close brace, a comment will be added.</html>"
+Description="<html>If a function body exceeds the specified number of newlines and doesn't have a comment after<BR>the close brace, a comment will be added.</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_add_long_function_closebrace_comment="
 MinVal=0
-MaxVal=50
+MaxVal=16
 ValueDefault=0
 
 [Mod Add Long Namespace Closebrace Comment]
 Category=9
-Description="<html>If a namespace body exceeds the specified number of newlines and doesn't<br/>have a comment after the close brace, a comment will be added.</html>"
+Description="<html>If a namespace body exceeds the specified number of newlines and doesn't have a comment after<BR>the close brace, a comment will be added.</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_add_long_namespace_closebrace_comment="
@@ -5489,7 +5354,7 @@
 
 [Mod Add Long Class Closebrace Comment]
 Category=9
-Description="<html>If a class body exceeds the specified number of newlines and doesn't have a<br/>comment after the close brace, a comment will be added.</html>"
+Description="<html>If a class body exceeds the specified number of newlines and doesn't have a comment after<BR>the close brace, a comment will be added.</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_add_long_class_closebrace_comment="
@@ -5499,17 +5364,17 @@
 
 [Mod Add Long Switch Closebrace Comment]
 Category=9
-Description="<html>If a switch body exceeds the specified number of newlines and doesn't have a<br/>comment after the close brace, a comment will be added.</html>"
+Description="<html>If a switch body exceeds the specified number of newlines and doesn't have a comment after<BR>the close brace, a comment will be added.</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_add_long_switch_closebrace_comment="
 MinVal=0
-MaxVal=50
+MaxVal=16
 ValueDefault=0
 
 [Mod Add Long Ifdef Endif Comment]
 Category=9
-Description="<html>If an #ifdef body exceeds the specified number of newlines and doesn't have<br/>a comment after the #endif, a comment will be added.</html>"
+Description="<html>If an #ifdef body exceeds the specified number of newlines and doesn't have a comment after<BR>the #endif, a comment will be added.</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_add_long_ifdef_endif_comment="
@@ -5519,7 +5384,7 @@
 
 [Mod Add Long Ifdef Else Comment]
 Category=9
-Description="<html>If an #ifdef or #else body exceeds the specified number of newlines and<br/>doesn't have a comment after the #else, a comment will be added.</html>"
+Description="<html>If an #ifdef or #else body exceeds the specified number of newlines and doesn't have a comment after<BR>the #else, a comment will be added.</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_add_long_ifdef_else_comment="
@@ -5529,160 +5394,151 @@
 
 [Mod Sort Import]
 Category=9
-Description="<html>Whether to sort consecutive single-line 'import' statements.</html>"
+Description="<html>If True, will sort consecutive single-line 'import' statements [Java, D].</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_sort_import=true|mod_sort_import=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Sort Using]
 Category=9
-Description="<html>(C#) Whether to sort consecutive single-line 'using' statements.</html>"
+Description="<html>If True, will sort consecutive single-line 'using' statements [C#].</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_sort_using=true|mod_sort_using=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Sort Include]
 Category=9
-Description="<html>Whether to sort consecutive single-line '#include' statements (C/C++) and<br/>'#import' statements (Objective-C). Be aware that this has the potential to<br/>break your code if your includes/imports have ordering dependencies.</html>"
+Description="<html>If True, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]<BR>This is generally a bad idea, as it may break your code.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_sort_include=true|mod_sort_include=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Move Case Break]
 Category=9
-Description="<html>Whether to move a 'break' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } break;' → 'case X: { ... break; }'.</html>"
+Description="<html>If True, it will move a 'break' that appears after a fully braced 'case' before the close brace.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_move_case_break=true|mod_move_case_break=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Case Brace]
 Category=9
-Description="<html>Add or remove braces around a fully braced case statement. Will only remove<br/>braces if there are no variable declarations in the block.</html>"
+Description="<html>Will add or remove the braces around a fully braced case statement.<BR>Will only remove the braces if there are no variable declarations in the block.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_case_brace=ignore|mod_case_brace=add|mod_case_brace=remove|mod_case_brace=force
+Choices="mod_case_brace=ignore|mod_case_brace=add|mod_case_brace=remove|mod_case_brace=force"
 ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Remove Empty Return]
 Category=9
-Description="<html>Whether to remove a void 'return;' that appears as the last statement in a<br/>function.</html>"
+Description="<html>If True, it will remove a void 'return;' that appears as the last statement in a function.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_remove_empty_return=true|mod_remove_empty_return=false
-ValueDefault=false
-
-[Mod Enum Last Comma]
-Category=9
-Description="<html>Add or remove the comma after the last value of an enumeration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=mod_enum_last_comma=ignore|mod_enum_last_comma=add|mod_enum_last_comma=remove|mod_enum_last_comma=force
-ChoicesReadable="Ignore Mod Enum Last Comma|Add Mod Enum Last Comma|Remove Mod Enum Last Comma|Force Mod Enum Last Comma"
-ValueDefault=ignore
+ValueDefault=0
 
 [Mod Sort Oc Properties]
 Category=9
-Description="<html>(OC) Whether to organize the properties. If true, properties will be<br/>rearranged according to the mod_sort_oc_property_*_weight factors.</html>"
+Description="<html>If True, it will organize the properties (Obj-C).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=mod_sort_oc_properties=true|mod_sort_oc_properties=false
-ValueDefault=false
+ValueDefault=0
 
 [Mod Sort Oc Property Class Weight]
 Category=9
-Description="<html>(OC) Weight of a class property modifier.</html>"
+Description="<html>Determines weight of class property modifier (Obj-C).</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_sort_oc_property_class_weight="
-MinVal=
-MaxVal=
+MinVal=0
+MaxVal=16
 ValueDefault=0
 
 [Mod Sort Oc Property Thread Safe Weight]
 Category=9
-Description="<html>(OC) Weight of 'atomic' and 'nonatomic'.</html>"
+Description="<html>Determines weight of atomic, nonatomic (Obj-C).</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_sort_oc_property_thread_safe_weight="
-MinVal=
-MaxVal=
+MinVal=0
+MaxVal=16
 ValueDefault=0
 
 [Mod Sort Oc Property Readwrite Weight]
 Category=9
-Description="<html>(OC) Weight of 'readwrite' when organizing properties.</html>"
+Description="<html>Determines weight of readwrite (Obj-C).</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_sort_oc_property_readwrite_weight="
-MinVal=
-MaxVal=
+MinVal=0
+MaxVal=16
 ValueDefault=0
 
 [Mod Sort Oc Property Reference Weight]
 Category=9
-Description="<html>(OC) Weight of a reference type specifier ('retain', 'copy', 'assign',<br/>'weak', 'strong') when organizing properties.</html>"
+Description="<html>Determines weight of reference type (retain, copy, assign, weak, strong) (Obj-C).</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_sort_oc_property_reference_weight="
-MinVal=
-MaxVal=
+MinVal=0
+MaxVal=16
 ValueDefault=0
 
 [Mod Sort Oc Property Getter Weight]
 Category=9
-Description="<html>(OC) Weight of getter type ('getter=') when organizing properties.</html>"
+Description="<html>Determines weight of getter type (getter=) (Obj-C).</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_sort_oc_property_getter_weight="
-MinVal=
-MaxVal=
+MinVal=0
+MaxVal=16
 ValueDefault=0
 
 [Mod Sort Oc Property Setter Weight]
 Category=9
-Description="<html>(OC) Weight of setter type ('setter=') when organizing properties.</html>"
+Description="<html>Determines weight of setter type (setter=) (Obj-C).</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_sort_oc_property_setter_weight="
-MinVal=
-MaxVal=
+MinVal=0
+MaxVal=16
 ValueDefault=0
 
 [Mod Sort Oc Property Nullability Weight]
 Category=9
-Description="<html>(OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',<br/>'null_resettable') when organizing properties.</html>"
+Description="<html>Determines weight of nullability type (nullable, nonnull, null_unspecified, null_resettable) (Obj-C).</html>"
 Enabled=false
 EditorType=numeric
 CallName="mod_sort_oc_property_nullability_weight="
-MinVal=
-MaxVal=
+MinVal=0
+MaxVal=16
 ValueDefault=0
 
 [Pp Indent]
 Category=10
-Description="<html>Add or remove indentation of preprocessor directives inside #if blocks<br/>at brace level 0 (file-level).</html>"
+Description="<html>Control indent of preprocessors inside #if blocks at brace level 0 (file-level).</html>"
 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"
 ChoicesReadable="Ignore Pp Indent|Add Pp Indent|Remove Pp Indent|Force Pp Indent"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pp Indent At Level]
 Category=10
-Description="<html>Whether to indent #if/#else/#endif at the brace level. If false, these are<br/>indented from column 1.</html>"
+Description="<html>Whether to indent #if/#else/#endif at the brace level (True) or from column 1 (False).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false
-ValueDefault=false
+ValueDefault=0
 
 [Pp Indent Count]
 Category=10
-Description="<html>Specifies the number of columns to indent preprocessors per level<br/>at brace level 0 (file-level). If pp_indent_at_level=false, also specifies<br/>the number of columns to indent preprocessors per level<br/>at brace level &gt; 0 (function-level).<br/><br/>Default: 1</html>"
+Description="<html>Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).<BR>If pp_indent_at_level=False, specifies the number of columns to indent preprocessors per level at brace level &gt; 0 (function-level).<BR>Default=1.</html>"
 Enabled=false
 EditorType=numeric
 CallName="pp_indent_count="
@@ -5695,13 +5551,13 @@
 Description="<html>Add or remove space after # based on pp_level of #if blocks.</html>"
 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"
 ChoicesReadable="Ignore Pp Space|Add Pp Space|Remove Pp Space|Force Pp Space"
-ValueDefault=ignore
+ValueDefault=0
 
 [Pp Space Count]
 Category=10
-Description="<html>Sets the number of spaces per level added with pp_space.</html>"
+Description="<html>Sets the number of spaces added with pp_space.</html>"
 Enabled=false
 EditorType=numeric
 CallName="pp_space_count="
@@ -5711,11 +5567,11 @@
 
 [Pp Indent Region]
 Category=10
-Description="<html>The indent for '#region' and '#endregion' in C# and '#pragma region' in<br/>C/C++. Negative values decrease indent down to the first column.</html>"
+Description="<html>The indent for #region and #endregion in C# and '#pragma region' in C/C++.</html>"
 Enabled=false
 EditorType=numeric
 CallName="pp_indent_region="
-MinVal=-16
+MinVal=0
 MaxVal=16
 ValueDefault=0
 
@@ -5725,33 +5581,33 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_region_indent_code=true|pp_region_indent_code=false
-ValueDefault=false
+ValueDefault=0
 
 [Pp Indent If]
 Category=10
-Description="<html>If pp_indent_at_level=true, sets the indent for #if, #else and #endif when<br/>not at file-level. Negative values decrease indent down to the first column.<br/><br/>=0: Indent preprocessors using output_tab_size<br/>&gt;0: Column at which all preprocessors will be indented</html>"
+Description="<html>If pp_indent_at_level=True, sets the indent for #if, #else and #endif when not at file-level.<BR>0:  indent preprocessors using output_tab_size.<BR>&gt;0: column at which all preprocessors will be indented.</html>"
 Enabled=false
 EditorType=numeric
 CallName="pp_indent_if="
-MinVal=-16
+MinVal=0
 MaxVal=16
 ValueDefault=0
 
 [Pp If Indent Code]
 Category=10
-Description="<html>Whether to indent the code between #if, #else and #endif.</html>"
+Description="<html>Control whether to indent the code between #if, #else and #endif.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_if_indent_code=true|pp_if_indent_code=false
-ValueDefault=false
+ValueDefault=0
 
 [Pp Define At Level]
 Category=10
-Description="<html>Whether to indent '#define' at the brace level. If false, these are<br/>indented from column 1.</html>"
+Description="<html>Whether to indent '#define' at the brace level (True) or from column 1 (false).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_define_at_level=true|pp_define_at_level=false
-ValueDefault=false
+ValueDefault=0
 
 [Pp Ignore Define Body]
 Category=10
@@ -5759,39 +5615,39 @@
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_ignore_define_body=true|pp_ignore_define_body=false
-ValueDefault=false
+ValueDefault=0
 
 [Pp Indent Case]
 Category=10
-Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the case statements<br/>directly inside of.<br/><br/>Default: true</html>"
+Description="<html>Whether to indent case statements between #if, #else, and #endif.<BR>Only applies to the indent of the preprocesser that the case statements directly inside of.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_indent_case=true|pp_indent_case=false
-ValueDefault=true
+ValueDefault=1
 
 [Pp Indent Func Def]
 Category=10
-Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the function definition<br/>is directly inside of.<br/><br/>Default: true</html>"
+Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<BR>Only applies to the indent of the preprocesser that the function definition is directly inside of.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_indent_func_def=true|pp_indent_func_def=false
-ValueDefault=true
+ValueDefault=1
 
 [Pp Indent Extern]
 Category=10
-Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the extern block is<br/>directly inside of.<br/><br/>Default: true</html>"
+Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<BR>Only applies to the indent of the preprocesser that the extern block is directly inside of.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_indent_extern=true|pp_indent_extern=false
-ValueDefault=true
+ValueDefault=1
 
 [Pp Indent Brace]
 Category=10
-Description="<html>Whether to indent braces directly inside #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the braces are directly<br/>inside of.<br/><br/>Default: true</html>"
+Description="<html>Whether to indent braces directly inside #if, #else, and #endif.<BR>Only applies to the indent of the preprocesser that the braces are directly inside of.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=pp_indent_brace=true|pp_indent_brace=false
-ValueDefault=true
+ValueDefault=1
 
 [Include Category 0]
 Category=11
@@ -5819,39 +5675,39 @@
 
 [Use Indent Func Call Param]
 Category=12
-Description="<html>true:  indent_func_call_param will be used (default)<br/>false: indent_func_call_param will NOT be used<br/><br/>Default: true</html>"
+Description="<html>True:  indent_func_call_param will be used (default)<BR>False: indent_func_call_param will NOT be used.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=use_indent_func_call_param=true|use_indent_func_call_param=false
-ValueDefault=true
+ValueDefault=1
 
 [Use Indent Continue Only Once]
 Category=12
-Description="<html>The value of the indentation for a continuation line is calculated<br/>differently if the statement is:<br/>- a declaration: your case with QString fileName ...<br/>- an assignment: your case with pSettings = new QSettings( ...<br/><br/>At the second case the indentation value might be used twice:<br/>- at the assignment<br/>- at the function call (if present)<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indent_continue will be used only once<br/>false: indent_continue will be used every time (default)</html>"
+Description="<html>The value of the indentation for a continuation line is calculate differently if the statement is:<BR>  a declaration: your case with QString fileName ...<BR>  an assignment: your case with pSettings = new QSettings( ...<BR>At the second case the indentation value might be used twice:<BR>  at the assignment<BR>  at the function call (if present)<BR>To prevent the double use of the indentation value, use this option with the value 'True'.<BR>True:  indent_continue will be used only once<BR>False: indent_continue will be used every time (default).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
-ValueDefault=false
+ValueDefault=0
 
 [Indent Cpp Lambda Only Once]
 Category=12
-Description="<html>The value might be used twice:<br/>- at the assignment<br/>- at the opening brace<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indentation will be used only once<br/>false: indentation will be used every time (default)</html>"
+Description="<html>the value might be used twice:<BR>  at the assignment<BR>  at the opening brace<BR>To prevent the double use of the indentation value, use this option with the value 'True'.<BR>True:  indentation will be used only once<BR>False: indentation will be used every time (default).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
-ValueDefault=false
+ValueDefault=0
 
 [Use Options Overriding For Qt Macros]
 Category=12
-Description="<html>Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,<br/>this tries to format these so that they match Qt's normalized form (i.e. the<br/>result of QMetaObject::normalizedSignature), which can slightly improve the<br/>performance of the QObject::connect call, rather than how they would<br/>otherwise be formatted.<br/><br/>See options_for_QT.cpp for details.<br/><br/>Default: true</html>"
+Description="<html>SIGNAL/SLOT Qt macros have special formatting options. See options_for_QT.cpp for details.<BR>Default=True.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=use_options_overriding_for_qt_macros=true|use_options_overriding_for_qt_macros=false
-ValueDefault=true
+ValueDefault=1
 
 [Warn Level Tabs Found In Verbatim String Literals]
 Category=13
-Description="<html>(C#) Warning is given if doing tab-to-\t replacement and we have found one<br/>in a C# verbatim string literal.<br/><br/>Default: 2</html>"
+Description="<html>Warning is given if doing tab-to-\t replacement and we have found one in a C# verbatim string literal.</html>"
 Enabled=false
 EditorType=numeric
 CallName="warn_level_tabs_found_in_verbatim_string_literals="
diff -ru orig/uncrustify-uncrustify-0.68.1/tests/CMakeLists.txt new/uncrustify-uncrustify-0.68.1/tests/CMakeLists.txt
--- orig/uncrustify-uncrustify-0.68.1/tests/CMakeLists.txt	2018-11-20 18:04:30.000000000 +0100
+++ new/uncrustify-uncrustify-0.68.1/tests/CMakeLists.txt	2018-11-22 09:59:35.000000000 +0100
@@ -20,10 +20,11 @@
   list(APPEND test_suites staging.test)
 endif()
 
-option("UNCRUSTIFY_SEPARATE_TESTS"
-  "Create a separate CTest test for each test case;\
-\ this is slower, especially with Python 3" OFF
+set(stdoc
+  "Create a separate CTest test for each test case"
+  " this is slower, especially with Python 3"
 )
+option("UNCRUSTIFY_SEPARATE_TESTS" "${stdoc}" OFF)
 if (UNCRUSTIFY_SEPARATE_TESTS)
   set(tests_ctest_file "${CMAKE_CURRENT_BINARY_DIR}/tests.cmake")
   set_property(DIRECTORY PROPERTY TEST_INCLUDE_FILE ${tests_ctest_file})

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: 01/01: gnu: uncrustify: Update to 0.68.1.
  2018-11-30 22:02     ` Ludovic Courtès
@ 2018-12-01  0:27       ` Tobias Geerinckx-Rice
  2018-12-01  5:02         ` Mark H Weaver
  0 siblings, 1 reply; 6+ messages in thread
From: Tobias Geerinckx-Rice @ 2018-12-01  0:27 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

Ludovic Courtès wrote:
> diff -ru 
> orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt 
> new/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt
> --- 
> orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt 
> 2018-11-20 18:04:30.000000000 +0100
> +++ 
> new/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt 
> 2018-11-22 09:59:35.000000000 +0100
> @@ -1,2684 +1,2197 @@
> -# Uncrustify-0.68
> -
> +# Uncrustify-0.67

Odd.

T G-R

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: 01/01: gnu: uncrustify: Update to 0.68.1.
  2018-12-01  0:27       ` Tobias Geerinckx-Rice
@ 2018-12-01  5:02         ` Mark H Weaver
  0 siblings, 0 replies; 6+ messages in thread
From: Mark H Weaver @ 2018-12-01  5:02 UTC (permalink / raw)
  To: Tobias Geerinckx-Rice; +Cc: guix-devel

Tobias Geerinckx-Rice <somobody@not-sent-or-endorsed-by.tobias.gr>
writes:

> Ludovic Courtès wrote:
>> diff -ru
>> orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt
>> new/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt
>> --- 
>> orig/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt
>> 2018-11-20 18:04:30.000000000 +0100
>> +++ new/uncrustify-uncrustify-0.68.1/documentation/htdocs/config.txt
>> 2018-11-22 09:59:35.000000000 +0100
>> @@ -1,2684 +1,2197 @@
>> -# Uncrustify-0.68
>> -
>> +# Uncrustify-0.67
>
> Odd.

Very odd indeed.  In 4 out of 5 files in the diff, "Uncrustify-0.68" has
been replaced with "Uncrustify-0.67".  I wonder how this compares with
the actual 0.67 release.

       Mark

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-12-01  5:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20181125134156.8362.7263@vcs0.savannah.gnu.org>
     [not found] ` <20181125134156.B66BE209B2@vcs0.savannah.gnu.org>
2018-11-30  0:16   ` 01/01: gnu: uncrustify: Update to 0.68.1 Mark H Weaver
2018-11-30 12:09     ` Pierre Neidhardt
2018-11-30 15:59       ` Ricardo Wurmus
2018-11-30 22:02     ` Ludovic Courtès
2018-12-01  0:27       ` Tobias Geerinckx-Rice
2018-12-01  5:02         ` Mark H Weaver

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).