4046 files changed, 28338 insertions, 18607 deletions

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/TODO b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/TODO
deleted file mode 100644
index 9b800ac4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-TODO list:
-
-* Convert copyright file to machine-readable format.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/gbp.conf b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/gbp.conf
deleted file mode 100644
index f66f0145..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/gbp.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-compression = xz
-
-[import-orig]
-upstream-branch = upstream-nondfsg
-pristine-tar = False
-merge = False
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/005_upstream_45681e88.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/005_upstream_45681e88.diff
deleted file mode 100644
index f4d8cb3b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/005_upstream_45681e88.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Backported commit 45681e88 from upstream git repository. This fixes FTBFS on ppcel and armxx archs.
---- a/src/output.cpp
-+++ b/src/output.cpp
-@@ -544,11 +544,7 @@
-          {
-             for (auto *ch = pc->text(); *ch != '\0'; ++ch)
-             {
--               if (  *ch > 0
--                  || !chunk_is_token(pc, CT_COMMENT_MULTI))
--               {
--                  fprintf(pfile, "%c", *ch);
--               }
-+               fprintf(pfile, "%c", *ch);
- 
-                if (*ch == '"')
-                {
---- a/tests/cli/output/class_enum_struct_union.csv
-+++ b/tests/cli/output/class_enum_struct_union.csv
-@@ -1,9 +1,9 @@
- number of loops,4,
- language,CPP,
- Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig Sp Before,Br,Lvl,pp,Flags,Nl Before,Nl After,Text,
--1,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,3,0,0,0,"",9,0," /**    * the enum (and variable declarations thereof) could be of    * the following forms:    *    * ""enum type [: integral_type] { ... } [x, ...]""    * ""enum type [: integral_type]""    * ""enum class type [: integral_type] { ... } [x, ...]""    * ""enum class type [: integral_type]""    * ""enum [: integral_type] { ... } x, ...""    */"
-+1,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,3,0,0,0,"",9,0," /**␤    * the enum (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * ""enum type [: integral_type] { ... } [x, ...]""␤    * ""enum type [: integral_type]""␤    * ""enum class type [: integral_type] { ... } [x, ...]""␤    * ""enum class type [: integral_type]""␤    * ""enum [: integral_type] { ... } x, ...""␤    */"
- 10,NEWLINE,NONE,PARENT_NOT_SET,7,7,4,0,0,0,0,"",2,0,
--12,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,0,0,0,0,"",9,0," /**    * the class/struct (and variable declarations thereof) could be of    * the following forms:    *    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }    * template<...> class/struct[<...>] [macros/attributes ...] type    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]    * class/struct [macros/attributes ...] type [x, ...]    * class/struct [macros/attributes ...] [: bases] { } x, ...    */"
-+12,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,0,0,0,0,"",9,0," /**␤    * the class/struct (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }␤    * template<...> class/struct[<...>] [macros/attributes ...] type␤    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]␤    * class/struct [macros/attributes ...] type [x, ...]␤    * class/struct [macros/attributes ...] [: bases] { } x, ...␤    */"
- 21,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0,
- 23,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
- 23,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,0,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff
deleted file mode 100644
index ca26d397..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Backported commit 64d93e3fb from upstream git repository.
---- a/src/align_func_proto.cpp
-+++ b/src/align_func_proto.cpp
-@@ -47,8 +47,8 @@
-    log_rule_B("align_var_def_amp_style");
-    size_t       myamp_style = options::align_var_def_amp_style();
- 
--   const size_t max_level_count = 8;
--   const size_t max_brace_level = 8;
-+   const size_t max_level_count = 16;
-+   const size_t max_brace_level = 16;
- 
-    AlignStack   many_as[max_level_count + 1][max_brace_level + 1];
- 
---- a/src/logger.cpp
-+++ b/src/logger.cpp
-@@ -194,7 +194,7 @@
-       return;
-    }
-    // the value of buffer_length is experimental
--   const int buffer_length = 4100;
-+   const int buffer_length = 40000;
-    char      buf[buffer_length];
- 
-    // it MUST be a 'unsigned int' variable to be runable under windows
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/007_issue_3040.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/007_issue_3040.diff
deleted file mode 100644
index 99d4887f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/007_issue_3040.diff
+++ /dev/null
@@ -1,183 +0,0 @@
-Backported commits 5f3f392a and fb66774e from upstream. This solves upstream issues 3040.
-
---- a/src/braces.cpp
-+++ b/src/braces.cpp
-@@ -1290,7 +1290,7 @@
- static chunk_t *mod_case_brace_add(chunk_t *cl_colon)
- {
-    LOG_FUNC_ENTRY();
--   LOG_FMT(LMCB, "%s(%d): line %zu",
-+   LOG_FMT(LMCB, "%s(%d): line %zu\n",
-            __func__, __LINE__, cl_colon->orig_line);
- 
-    chunk_t *pc   = cl_colon;
-@@ -1309,7 +1309,28 @@
-          && (  chunk_is_token(pc, CT_CASE)
-             || chunk_is_token(pc, CT_BREAK)))
-       {
--         last = pc;
-+         // check if previous line is a preprocessor                     Issue #3040
-+         chunk_t *prev = chunk_get_prev_ncnl(pc);
-+         LOG_FMT(LMCB, "%s(%d): prev->text() is '%s', orig_line %zu\n",
-+                 __func__, __LINE__, prev->text(), prev->orig_line);
-+
-+         if (  chunk_is_preproc(prev)
-+            && chunk_is_not_token(prev, CT_PP_ENDIF))
-+         {
-+            // previous line is a preprocessor, but NOT #endif
-+            while (chunk_is_preproc(prev))
-+            {
-+               prev = chunk_get_prev_ncnl(prev);
-+            }
-+            chunk_t *next_prev = chunk_get_next_ncnl(prev);
-+            LOG_FMT(LMCB, "%s(%d): next_prev->text() is '%s', orig_line %zu\n",
-+                    __func__, __LINE__, next_prev->text(), next_prev->orig_line);
-+            last = next_prev;
-+         }
-+         else
-+         {
-+            last = pc;
-+         }
-          break;
-       }
-    }
---- /dev/null
-+++ b/tests/config/Issue_3040.cfg
-@@ -0,0 +1,7 @@
-+indent_columns                  = 2
-+indent_switch_case              = 2
-+nl_before_case                  = true
-+nl_after_case                   = true
-+eat_blanks_before_close_brace   = true
-+mod_move_case_break             = true
-+mod_case_brace                  = force
---- a/tests/cpp.test
-+++ b/tests/cpp.test
-@@ -827,6 +827,7 @@
- 34322  issue_2623_1.cfg                     cpp/issue_2623.cpp
- 34323  issue_2623_2.cfg                     cpp/issue_2623.cpp
- 34324  issue_2623_3.cfg                     cpp/issue_2623.cpp
-+34326  Issue_3040.cfg                       cpp/Issue_3040.cpp
- 
- # Adopt some UT tests
- 10000  empty.cfg                            cpp/621_this-spacing.cpp
---- /dev/null
-+++ b/tests/expected/cpp/34326-Issue_3040.cpp
-@@ -0,0 +1,62 @@
-+void main()
-+{
-+  switch (opcode ) {
-+
-+    case LocaleCompare:
-+    {
-+      return Number(localeCompare(s, a0.toString(exec)));
-+    }
-+
-+#ifndef KJS_PURE_ECMA
-+    case Big:
-+    {
-+      result = String("<big>" + s + "</big>");
-+      break;
-+    }
-+#endif
-+  }
-+
-+  switch (ev->command)
-+  {
-+    case (MIDI_NOTEON):
-+    {
-+      ev->note = *ptrdata; ptrdata++; currentpos++;
-+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-+      if (ev->vel==0)
-+	note[ev->chn][ev->note]=FALSE;
-+      else
-+	note[ev->chn][ev->note]=TRUE;
-+
-+#ifdef TRACKDEBUG2
-+      if (ev->chn==6) {
-+	if (ev->vel==0) printfdebug("Note Onf\n");
-+	else printfdebug("Note On\n");
-+      };
-+#endif
-+      break;
-+    }
-+
-+    case (MIDI_NOTEOFF):
-+    {
-+#ifdef TRACKDEBUG2
-+      if (ev->chn==6) printfdebug("Note Off\n");
-+#endif
-+      ev->note = *ptrdata; ptrdata++; currentpos++;
-+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-+      note[ev->chn][ev->note]=FALSE;
-+
-+      break;
-+    }
-+
-+    case (MIDI_KEY_PRESSURE):
-+    {
-+#ifdef TRACKDEBUG2
-+      if (ev->chn==6) printfdebug ("Key press\n");
-+#endif
-+      ev->note = *ptrdata; ptrdata++; currentpos++;
-+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-+      break;
-+    }
-+  }
-+}
-+
---- /dev/null
-+++ b/tests/input/cpp/Issue_3040.cpp
-@@ -0,0 +1,52 @@
-+void main()
-+{
-+  switch (opcode ) {
-+
-+    case LocaleCompare:
-+      return Number(localeCompare(s, a0.toString(exec)));
-+
-+#ifndef KJS_PURE_ECMA
-+    case Big:
-+      result = String("<big>" + s + "</big>");
-+      break;
-+#endif
-+
-+  }
-+
-+  switch (ev->command)
-+  {
-+    case (MIDI_NOTEON):
-+      ev->note = *ptrdata; ptrdata++; currentpos++;
-+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
-+      if (ev->vel==0)
-+	note[ev->chn][ev->note]=FALSE;
-+      else
-+	note[ev->chn][ev->note]=TRUE;
-+
-+#ifdef TRACKDEBUG2
-+      if (ev->chn==6) {
-+	if (ev->vel==0) printfdebug("Note Onf\n");
-+	else printfdebug("Note On\n");
-+      };
-+#endif
-+      break;
-+    case (MIDI_NOTEOFF) :
-+#ifdef TRACKDEBUG2
-+      if (ev->chn==6) printfdebug("Note Off\n");
-+#endif
-+      ev->note = *ptrdata;ptrdata++;currentpos++; 
-+      ev->vel  = *ptrdata;ptrdata++;currentpos++;
-+      note[ev->chn][ev->note]=FALSE;
-+
-+      break;
-+    case (MIDI_KEY_PRESSURE) :
-+#ifdef TRACKDEBUG2
-+      if (ev->chn==6) printfdebug ("Key press\n");
-+#endif
-+      ev->note = *ptrdata;ptrdata++;currentpos++; 
-+      ev->vel  = *ptrdata;ptrdata++;currentpos++;
-+      break;
-+
-+		}
-+}
-+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules
deleted file mode 100755
index 2ed2ae90..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-
-%:
-	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure $@ -- $(DEB_CMAKE_NORMAL_ARGS) -DUNCRUSTIFY_SEPARATE_TESTS=ON
-
-override_dh_clean:
-	dh_clean
-	rm -rf tests/results
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/watch b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/watch
deleted file mode 100644
index 9eb014c3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/watch
+++ /dev/null
@@ -1,5 +0,0 @@
-version=4
-opts=dversionmangle=s/\+dfsg\d*$// \
-https://github.com/uncrustify/uncrustify/releases \
-(?:.*?/)?uncrustify-(\d[\d.]*)\.tar\.gz debian uupdate
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/uigui_uncrustify.ini b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/uigui_uncrustify.ini
deleted file mode 100644
index 4257057b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/uigui_uncrustify.ini
+++ /dev/null
@@ -1,6616 +0,0 @@
-[header]
-categories=(0)General options|(17)Spacing options|(240)Indenting options|(338)Newline adding and removing options|(517)Blank line options|(566)Positioning options|(578)Line splitting options|(582)Code alignment options (not left column spaces/tabs)|(649)Comment modification options|(673)Code modifying options (non-whitespace)|(714)Preprocessor options|(729)Sort includes options|(732)Use or Do not Use options|(738)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
-indenterFileName=uncrustify
-indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
-inputFileName=indentinput
-inputFileParameter="-f "
-manual=http://uncrustify.sourceforge.net/config.txt
-outputFileName=indentoutput
-outputFileParameter="-o "
-stringparaminquotes=false
-parameterOrder=ipo
-showHelpParameter=-h
-stringparaminquotes=false
-useCfgFileParameter="-c "
-version=Uncrustify_d-0.71.0-250-9c62bb00
-
-[Newlines]
-Category=0
-Description="<html>(0)The type of line endings.<br/><br/>Default: auto</html>"
-Enabled=false
-EditorType=multiple
-Choices=newlines=lf|newlines=crlf|newlines=cr|newlines=auto
-ChoicesReadable="(0)Newlines Unix|(0)Newlines Win|(0)Newlines Mac|(0)Newlines Auto"
-ValueDefault=auto
-
-[Input Tab Size]
-Category=0
-Description="<html>(1)The original size of tabs in the input.<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="input_tab_size="
-MinVal=1
-MaxVal=32
-ValueDefault=8
-
-[Output Tab Size]
-Category=0
-Description="<html>(2)The size of tabs in the output (only used if align_with_tabs=true).<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="output_tab_size="
-MinVal=1
-MaxVal=32
-ValueDefault=8
-
-[String Escape Char]
-Category=0
-Description="<html>(3)The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).<br/><br/>Default: 92</html>"
-Enabled=false
-EditorType=numeric
-CallName="string_escape_char="
-MinVal=0
-MaxVal=255
-ValueDefault=92
-
-[String Escape Char2]
-Category=0
-Description="<html>(4)Alternate string escape char (usually only used for Pawn).<br/>Only works right before the quote char.</html>"
-Enabled=false
-EditorType=numeric
-CallName="string_escape_char2="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[String Replace Tab Chars]
-Category=0
-Description="<html>(5)Replace tab characters found in string literals with the escape sequence \t<br/>instead.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=string_replace_tab_chars=true|string_replace_tab_chars=false
-ValueDefault=false
-
-[Tok Split Gte]
-Category=0
-Description="<html>(6)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=tok_split_gte=true|tok_split_gte=false
-ValueDefault=false
-
-[Disable Processing Nl Cont]
-Category=0
-Description="<html>(7)Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=disable_processing_nl_cont=true|disable_processing_nl_cont=false
-ValueDefault=false
-
-[Disable Processing Cmt]
-Category=0
-Description="<html>(8)Specify the marker used in comments to disable processing of part of the<br/>file.<br/>The comment should be used alone in one line.<br/><br/>Default:  *INDENT-OFF*</html>"
-Enabled=false
-CallName=disable_processing_cmt=
-EditorType=string
-ValueDefault= *INDENT-OFF*
-
-[Enable Processing Cmt]
-Category=0
-Description="<html>(9)Specify the marker used in comments to (re)enable processing in a file.<br/>The comment should be used alone in one line.<br/><br/>Default:  *INDENT-ON*</html>"
-Enabled=false
-CallName=enable_processing_cmt=
-EditorType=string
-ValueDefault= *INDENT-ON*
-
-[Enable Digraphs]
-Category=0
-Description="<html>(10)Enable parsing of digraphs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=enable_digraphs=true|enable_digraphs=false
-ValueDefault=false
-
-[Utf8 Bom]
-Category=0
-Description="<html>(11)Add or remove the UTF-8 BOM (recommend 'remove').</html>"
-Enabled=false
-EditorType=multiple
-Choices=utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force
-ChoicesReadable="(11)Ignore Utf8 Bom|(11)Add Utf8 Bom|(11)Remove Utf8 Bom|(11)Force Utf8 Bom"
-ValueDefault=ignore
-
-[Utf8 Byte]
-Category=0
-Description="<html>(12)If the file contains bytes with values between 128 and 255, but is not<br/>UTF-8, then output as UTF-8.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=utf8_byte=true|utf8_byte=false
-ValueDefault=false
-
-[Utf8 Force]
-Category=0
-Description="<html>(13)Force the output encoding to UTF-8.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=utf8_force=true|utf8_force=false
-ValueDefault=false
-
-[Sp Do Brace Open]
-Category=0
-Description="<html>(14)Add or remove space between 'do' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_do_brace_open=ignore|sp_do_brace_open=add|sp_do_brace_open=remove|sp_do_brace_open=force
-ChoicesReadable="(14)Ignore Sp Do Brace Open|(14)Add Sp Do Brace Open|(14)Remove Sp Do Brace Open|(14)Force Sp Do Brace Open"
-ValueDefault=ignore
-
-[Sp Brace Close While]
-Category=0
-Description="<html>(15)Add or remove space between '}' and 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_close_while=ignore|sp_brace_close_while=add|sp_brace_close_while=remove|sp_brace_close_while=force
-ChoicesReadable="(15)Ignore Sp Brace Close While|(15)Add Sp Brace Close While|(15)Remove Sp Brace Close While|(15)Force Sp Brace Close While"
-ValueDefault=ignore
-
-[Sp While Paren Open]
-Category=0
-Description="<html>(16)Add or remove space between 'while' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_while_paren_open=ignore|sp_while_paren_open=add|sp_while_paren_open=remove|sp_while_paren_open=force
-ChoicesReadable="(16)Ignore Sp While Paren Open|(16)Add Sp While Paren Open|(16)Remove Sp While Paren Open|(16)Force Sp While Paren Open"
-ValueDefault=ignore
-
-[Sp Arith]
-Category=1
-Description="<html>(17)Add or remove space around non-assignment symbolic operators ('+', '/', '%',<br/>'&lt;&lt;', and so forth).</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_arith=ignore|sp_arith=add|sp_arith=remove|sp_arith=force
-ChoicesReadable="(17)Ignore Sp Arith|(17)Add Sp Arith|(17)Remove Sp Arith|(17)Force Sp Arith"
-ValueDefault=ignore
-
-[Sp Arith Additive]
-Category=1
-Description="<html>(18)Add or remove space around arithmetic operators '+' and '-'.<br/><br/>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
-ChoicesReadable="(18)Ignore Sp Arith Additive|(18)Add Sp Arith Additive|(18)Remove Sp Arith Additive|(18)Force Sp Arith Additive"
-ValueDefault=ignore
-
-[Sp Assign]
-Category=1
-Description="<html>(19)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
-ChoicesReadable="(19)Ignore Sp Assign|(19)Add Sp Assign|(19)Remove Sp Assign|(19)Force Sp Assign"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Assign]
-Category=1
-Description="<html>(20)Add or remove space around '=' in C++11 lambda capture specifications.<br/><br/>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
-ChoicesReadable="(20)Ignore Sp Cpp Lambda Assign|(20)Add Sp Cpp Lambda Assign|(20)Remove Sp Cpp Lambda Assign|(20)Force Sp Cpp Lambda Assign"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Square Paren]
-Category=1
-Description="<html>(21)Add or remove space after the capture specification of a C++11 lambda when<br/>an argument list is present, as in '[] &lt;here&gt; (int x){ ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_square_paren=ignore|sp_cpp_lambda_square_paren=add|sp_cpp_lambda_square_paren=remove|sp_cpp_lambda_square_paren=force
-ChoicesReadable="(21)Ignore Sp Cpp Lambda Square Paren|(21)Add Sp Cpp Lambda Square Paren|(21)Remove Sp Cpp Lambda Square Paren|(21)Force Sp Cpp Lambda Square Paren"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Square Brace]
-Category=1
-Description="<html>(22)Add or remove space after the capture specification of a C++11 lambda with<br/>no argument list is present, as in '[] &lt;here&gt; { ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_square_brace=ignore|sp_cpp_lambda_square_brace=add|sp_cpp_lambda_square_brace=remove|sp_cpp_lambda_square_brace=force
-ChoicesReadable="(22)Ignore Sp Cpp Lambda Square Brace|(22)Add Sp Cpp Lambda Square Brace|(22)Remove Sp Cpp Lambda Square Brace|(22)Force Sp Cpp Lambda Square Brace"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Paren Brace]
-Category=1
-Description="<html>(23)Add or remove space after the argument list of a C++11 lambda, as in<br/>'[](int x) &lt;here&gt; { ... }'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_paren_brace=ignore|sp_cpp_lambda_paren_brace=add|sp_cpp_lambda_paren_brace=remove|sp_cpp_lambda_paren_brace=force
-ChoicesReadable="(23)Ignore Sp Cpp Lambda Paren Brace|(23)Add Sp Cpp Lambda Paren Brace|(23)Remove Sp Cpp Lambda Paren Brace|(23)Force Sp Cpp Lambda Paren Brace"
-ValueDefault=ignore
-
-[Sp Cpp Lambda Fparen]
-Category=1
-Description="<html>(24)Add or remove space between a lambda body and its call operator of an<br/>immediately invoked lambda, as in '[]( ... ){ ... } &lt;here&gt; ( ... )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cpp_lambda_fparen=ignore|sp_cpp_lambda_fparen=add|sp_cpp_lambda_fparen=remove|sp_cpp_lambda_fparen=force
-ChoicesReadable="(24)Ignore Sp Cpp Lambda Fparen|(24)Add Sp Cpp Lambda Fparen|(24)Remove Sp Cpp Lambda Fparen|(24)Force Sp Cpp Lambda Fparen"
-ValueDefault=ignore
-
-[Sp Assign Default]
-Category=1
-Description="<html>(25)Add or remove space around assignment operator '=' in a prototype.<br/><br/>If set to ignore, use sp_assign.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force
-ChoicesReadable="(25)Ignore Sp Assign Default|(25)Add Sp Assign Default|(25)Remove Sp Assign Default|(25)Force Sp Assign Default"
-ValueDefault=ignore
-
-[Sp Before Assign]
-Category=1
-Description="<html>(26)Add or remove space before assignment operator '=', '+=', etc.<br/><br/>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
-ChoicesReadable="(26)Ignore Sp Before Assign|(26)Add Sp Before Assign|(26)Remove Sp Before Assign|(26)Force Sp Before Assign"
-ValueDefault=ignore
-
-[Sp After Assign]
-Category=1
-Description="<html>(27)Add or remove space after assignment operator '=', '+=', etc.<br/><br/>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
-ChoicesReadable="(27)Ignore Sp After Assign|(27)Add Sp After Assign|(27)Remove Sp After Assign|(27)Force Sp After Assign"
-ValueDefault=ignore
-
-[Sp Enum Paren]
-Category=1
-Description="<html>(28)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
-ChoicesReadable="(28)Ignore Sp Enum Paren|(28)Add Sp Enum Paren|(28)Remove Sp Enum Paren|(28)Force Sp Enum Paren"
-ValueDefault=ignore
-
-[Sp Enum Assign]
-Category=1
-Description="<html>(29)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
-ChoicesReadable="(29)Ignore Sp Enum Assign|(29)Add Sp Enum Assign|(29)Remove Sp Enum Assign|(29)Force Sp Enum Assign"
-ValueDefault=ignore
-
-[Sp Enum Before Assign]
-Category=1
-Description="<html>(30)Add or remove space before assignment '=' in enum.<br/><br/>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
-ChoicesReadable="(30)Ignore Sp Enum Before Assign|(30)Add Sp Enum Before Assign|(30)Remove Sp Enum Before Assign|(30)Force Sp Enum Before Assign"
-ValueDefault=ignore
-
-[Sp Enum After Assign]
-Category=1
-Description="<html>(31)Add or remove space after assignment '=' in enum.<br/><br/>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
-ChoicesReadable="(31)Ignore Sp Enum After Assign|(31)Add Sp Enum After Assign|(31)Remove Sp Enum After Assign|(31)Force Sp Enum After Assign"
-ValueDefault=ignore
-
-[Sp Enum Colon]
-Category=1
-Description="<html>(32)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
-ChoicesReadable="(32)Ignore Sp Enum Colon|(32)Add Sp Enum Colon|(32)Remove Sp Enum Colon|(32)Force Sp Enum Colon"
-ValueDefault=ignore
-
-[Sp Pp Concat]
-Category=1
-Description="<html>(33)Add or remove space around preprocessor '##' concatenation operator.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force
-ChoicesReadable="(33)Ignore Sp Pp Concat|(33)Add Sp Pp Concat|(33)Remove Sp Pp Concat|(33)Force Sp Pp Concat"
-ValueDefault=add
-
-[Sp Pp Stringify]
-Category=1
-Description="<html>(34)Add or remove space after preprocessor '#' stringify operator.<br/>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
-ChoicesReadable="(34)Ignore Sp Pp Stringify|(34)Add Sp Pp Stringify|(34)Remove Sp Pp Stringify|(34)Force Sp Pp Stringify"
-ValueDefault=ignore
-
-[Sp Before Pp Stringify]
-Category=1
-Description="<html>(35)Add or remove space before preprocessor '#' stringify operator<br/>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
-ChoicesReadable="(35)Ignore Sp Before Pp Stringify|(35)Add Sp Before Pp Stringify|(35)Remove Sp Before Pp Stringify|(35)Force Sp Before Pp Stringify"
-ValueDefault=ignore
-
-[Sp Bool]
-Category=1
-Description="<html>(36)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
-ChoicesReadable="(36)Ignore Sp Bool|(36)Add Sp Bool|(36)Remove Sp Bool|(36)Force Sp Bool"
-ValueDefault=ignore
-
-[Sp Compare]
-Category=1
-Description="<html>(37)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
-ChoicesReadable="(37)Ignore Sp Compare|(37)Add Sp Compare|(37)Remove Sp Compare|(37)Force Sp Compare"
-ValueDefault=ignore
-
-[Sp Inside Paren]
-Category=1
-Description="<html>(38)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
-ChoicesReadable="(38)Ignore Sp Inside Paren|(38)Add Sp Inside Paren|(38)Remove Sp Inside Paren|(38)Force Sp Inside Paren"
-ValueDefault=ignore
-
-[Sp Paren Paren]
-Category=1
-Description="<html>(39)Add or remove space between nested parentheses, i.e. '((' vs. ') )'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_paren=ignore|sp_paren_paren=add|sp_paren_paren=remove|sp_paren_paren=force
-ChoicesReadable="(39)Ignore Sp Paren Paren|(39)Add Sp Paren Paren|(39)Remove Sp Paren Paren|(39)Force Sp Paren Paren"
-ValueDefault=ignore
-
-[Sp Cparen Oparen]
-Category=1
-Description="<html>(40)Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_cparen_oparen=ignore|sp_cparen_oparen=add|sp_cparen_oparen=remove|sp_cparen_oparen=force
-ChoicesReadable="(40)Ignore Sp Cparen Oparen|(40)Add Sp Cparen Oparen|(40)Remove Sp Cparen Oparen|(40)Force Sp Cparen Oparen"
-ValueDefault=ignore
-
-[Sp Balance Nested Parens]
-Category=1
-Description="<html>(41)Whether to balance spaces inside nested parentheses.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_balance_nested_parens=true|sp_balance_nested_parens=false
-ValueDefault=false
-
-[Sp Paren Brace]
-Category=1
-Description="<html>(42)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
-ChoicesReadable="(42)Ignore Sp Paren Brace|(42)Add Sp Paren Brace|(42)Remove Sp Paren Brace|(42)Force Sp Paren Brace"
-ValueDefault=ignore
-
-[Sp Brace Brace]
-Category=1
-Description="<html>(43)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="(43)Ignore Sp Brace Brace|(43)Add Sp Brace Brace|(43)Remove Sp Brace Brace|(43)Force Sp Brace Brace"
-ValueDefault=ignore
-
-[Sp Before Ptr Star]
-Category=1
-Description="<html>(44)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
-ChoicesReadable="(44)Ignore Sp Before Ptr Star|(44)Add Sp Before Ptr Star|(44)Remove Sp Before Ptr Star|(44)Force Sp Before Ptr Star"
-ValueDefault=ignore
-
-[Sp Before Unnamed Ptr Star]
-Category=1
-Description="<html>(45)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>"
-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
-ChoicesReadable="(45)Ignore Sp Before Unnamed Ptr Star|(45)Add Sp Before Unnamed Ptr Star|(45)Remove Sp Before Unnamed Ptr Star|(45)Force Sp Before Unnamed Ptr Star"
-ValueDefault=ignore
-
-[Sp Between Ptr Star]
-Category=1
-Description="<html>(46)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
-ChoicesReadable="(46)Ignore Sp Between Ptr Star|(46)Add Sp Between Ptr Star|(46)Remove Sp Between Ptr Star|(46)Force Sp Between Ptr Star"
-ValueDefault=ignore
-
-[Sp After Ptr Star]
-Category=1
-Description="<html>(47)Add or remove space after pointer star '*', if followed by a word.<br/><br/>Overrides sp_type_func.</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
-ChoicesReadable="(47)Ignore Sp After Ptr Star|(47)Add Sp After Ptr Star|(47)Remove Sp After Ptr Star|(47)Force Sp After Ptr Star"
-ValueDefault=ignore
-
-[Sp After Ptr Block Caret]
-Category=1
-Description="<html>(48)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
-ChoicesReadable="(48)Ignore Sp After Ptr Block Caret|(48)Add Sp After Ptr Block Caret|(48)Remove Sp After Ptr Block Caret|(48)Force Sp After Ptr Block Caret"
-ValueDefault=ignore
-
-[Sp After Ptr Star Qualifier]
-Category=1
-Description="<html>(49)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
-ChoicesReadable="(49)Ignore Sp After Ptr Star Qualifier|(49)Add Sp After Ptr Star Qualifier|(49)Remove Sp After Ptr Star Qualifier|(49)Force Sp After Ptr Star Qualifier"
-ValueDefault=ignore
-
-[Sp After Ptr Star Func]
-Category=1
-Description="<html>(50)Add or remove space after a pointer star '*', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_ptr_star and sp_type_func.</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
-ChoicesReadable="(50)Ignore Sp After Ptr Star Func|(50)Add Sp After Ptr Star Func|(50)Remove Sp After Ptr Star Func|(50)Force Sp After Ptr Star Func"
-ValueDefault=ignore
-
-[Sp Ptr Star Paren]
-Category=1
-Description="<html>(51)Add or remove space after a pointer star '*', if followed by an open<br/>parenthesis, as in 'void* (*)().</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
-ChoicesReadable="(51)Ignore Sp Ptr Star Paren|(51)Add Sp Ptr Star Paren|(51)Remove Sp Ptr Star Paren|(51)Force Sp Ptr Star Paren"
-ValueDefault=ignore
-
-[Sp Before Ptr Star Func]
-Category=1
-Description="<html>(52)Add or remove space before a pointer star '*', if followed by a function<br/>prototype or function definition.</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
-ChoicesReadable="(52)Ignore Sp Before Ptr Star Func|(52)Add Sp Before Ptr Star Func|(52)Remove Sp Before Ptr Star Func|(52)Force Sp Before Ptr Star Func"
-ValueDefault=ignore
-
-[Sp Before Byref]
-Category=1
-Description="<html>(53)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
-ChoicesReadable="(53)Ignore Sp Before Byref|(53)Add Sp Before Byref|(53)Remove Sp Before Byref|(53)Force Sp Before Byref"
-ValueDefault=ignore
-
-[Sp Before Unnamed Byref]
-Category=1
-Description="<html>(54)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>"
-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
-ChoicesReadable="(54)Ignore Sp Before Unnamed Byref|(54)Add Sp Before Unnamed Byref|(54)Remove Sp Before Unnamed Byref|(54)Force Sp Before Unnamed Byref"
-ValueDefault=ignore
-
-[Sp After Byref]
-Category=1
-Description="<html>(55)Add or remove space after reference sign '&amp;', if followed by a word.<br/><br/>Overrides sp_type_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force
-ChoicesReadable="(55)Ignore Sp After Byref|(55)Add Sp After Byref|(55)Remove Sp After Byref|(55)Force Sp After Byref"
-ValueDefault=ignore
-
-[Sp After Byref Func]
-Category=1
-Description="<html>(56)Add or remove space after a reference sign '&amp;', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_byref and sp_type_func.</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
-ChoicesReadable="(56)Ignore Sp After Byref Func|(56)Add Sp After Byref Func|(56)Remove Sp After Byref Func|(56)Force Sp After Byref Func"
-ValueDefault=ignore
-
-[Sp Before Byref Func]
-Category=1
-Description="<html>(57)Add or remove space before a reference sign '&amp;', if followed by a function<br/>prototype or function definition.</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
-ChoicesReadable="(57)Ignore Sp Before Byref Func|(57)Add Sp Before Byref Func|(57)Remove Sp Before Byref Func|(57)Force Sp Before Byref Func"
-ValueDefault=ignore
-
-[Sp After Type]
-Category=1
-Description="<html>(58)Add or remove space between type and word. In cases where total removal of<br/>whitespace would be a syntax error, a value of 'remove' is treated the same<br/>as 'force'.<br/><br/>This also affects some other instances of space following a type that are<br/>not covered by other options; for example, between the return type and<br/>parenthesis of a function type template argument, between the type and<br/>parenthesis of an array parameter, or between 'decltype(...)' and the<br/>following word.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force
-ChoicesReadable="(58)Ignore Sp After Type|(58)Add Sp After Type|(58)Remove Sp After Type|(58)Force Sp After Type"
-ValueDefault=force
-
-[Sp After Decltype]
-Category=1
-Description="<html>(59)Add or remove space between 'decltype(...)' and word.<br/><br/>Overrides sp_after_type.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_decltype=ignore|sp_after_decltype=add|sp_after_decltype=remove|sp_after_decltype=force
-ChoicesReadable="(59)Ignore Sp After Decltype|(59)Add Sp After Decltype|(59)Remove Sp After Decltype|(59)Force Sp After Decltype"
-ValueDefault=ignore
-
-[Sp Before Template Paren]
-Category=1
-Description="<html>(60)(D) Add or remove space before the parenthesis in the D constructs<br/>'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
-ChoicesReadable="(60)Ignore Sp Before Template Paren|(60)Add Sp Before Template Paren|(60)Remove Sp Before Template Paren|(60)Force Sp Before Template Paren"
-ValueDefault=ignore
-
-[Sp Template Angle]
-Category=1
-Description="<html>(61)Add or remove space between 'template' and '&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
-ChoicesReadable="(61)Ignore Sp Template Angle|(61)Add Sp Template Angle|(61)Remove Sp Template Angle|(61)Force Sp Template Angle"
-ValueDefault=ignore
-
-[Sp Before Angle]
-Category=1
-Description="<html>(62)Add or remove space before '&lt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force
-ChoicesReadable="(62)Ignore Sp Before Angle|(62)Add Sp Before Angle|(62)Remove Sp Before Angle|(62)Force Sp Before Angle"
-ValueDefault=ignore
-
-[Sp Inside Angle]
-Category=1
-Description="<html>(63)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
-ChoicesReadable="(63)Ignore Sp Inside Angle|(63)Add Sp Inside Angle|(63)Remove Sp Inside Angle|(63)Force Sp Inside Angle"
-ValueDefault=ignore
-
-[Sp Inside Angle Empty]
-Category=1
-Description="<html>(64)Add or remove space inside '&lt;&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_angle_empty=ignore|sp_inside_angle_empty=add|sp_inside_angle_empty=remove|sp_inside_angle_empty=force
-ChoicesReadable="(64)Ignore Sp Inside Angle Empty|(64)Add Sp Inside Angle Empty|(64)Remove Sp Inside Angle Empty|(64)Force Sp Inside Angle Empty"
-ValueDefault=ignore
-
-[Sp Angle Colon]
-Category=1
-Description="<html>(65)Add or remove space between '&gt;' and ':'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_colon=ignore|sp_angle_colon=add|sp_angle_colon=remove|sp_angle_colon=force
-ChoicesReadable="(65)Ignore Sp Angle Colon|(65)Add Sp Angle Colon|(65)Remove Sp Angle Colon|(65)Force Sp Angle Colon"
-ValueDefault=ignore
-
-[Sp After Angle]
-Category=1
-Description="<html>(66)Add or remove space after '&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force
-ChoicesReadable="(66)Ignore Sp After Angle|(66)Add Sp After Angle|(66)Remove Sp After Angle|(66)Force Sp After Angle"
-ValueDefault=ignore
-
-[Sp Angle Paren]
-Category=1
-Description="<html>(67)Add or remove space between '&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
-ChoicesReadable="(67)Ignore Sp Angle Paren|(67)Add Sp Angle Paren|(67)Remove Sp Angle Paren|(67)Force Sp Angle Paren"
-ValueDefault=ignore
-
-[Sp Angle Paren Empty]
-Category=1
-Description="<html>(68)Add or remove space between '&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
-ChoicesReadable="(68)Ignore Sp Angle Paren Empty|(68)Add Sp Angle Paren Empty|(68)Remove Sp Angle Paren Empty|(68)Force Sp Angle Paren Empty"
-ValueDefault=ignore
-
-[Sp Angle Word]
-Category=1
-Description="<html>(69)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>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force
-ChoicesReadable="(69)Ignore Sp Angle Word|(69)Add Sp Angle Word|(69)Remove Sp Angle Word|(69)Force Sp Angle Word"
-ValueDefault=ignore
-
-[Sp Angle Shift]
-Category=1
-Description="<html>(70)Add or remove space between '&gt;' and '&gt;' in '&gt;&gt;' (template stuff).<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force
-ChoicesReadable="(70)Ignore Sp Angle Shift|(70)Add Sp Angle Shift|(70)Remove Sp Angle Shift|(70)Force Sp Angle Shift"
-ValueDefault=add
-
-[Sp Permit Cpp11 Shift]
-Category=1
-Description="<html>(71)(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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_permit_cpp11_shift=true|sp_permit_cpp11_shift=false
-ValueDefault=false
-
-[Sp Before Sparen]
-Category=1
-Description="<html>(72)Add or remove space before '(' of control statements ('if', 'for', 'switch',<br/>'while', etc.).</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_sparen=ignore|sp_before_sparen=add|sp_before_sparen=remove|sp_before_sparen=force
-ChoicesReadable="(72)Ignore Sp Before Sparen|(72)Add Sp Before Sparen|(72)Remove Sp Before Sparen|(72)Force Sp Before Sparen"
-ValueDefault=ignore
-
-[Sp Inside Sparen]
-Category=1
-Description="<html>(73)Add or remove space inside '(' and ')' of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_sparen=ignore|sp_inside_sparen=add|sp_inside_sparen=remove|sp_inside_sparen=force
-ChoicesReadable="(73)Ignore Sp Inside Sparen|(73)Add Sp Inside Sparen|(73)Remove Sp Inside Sparen|(73)Force Sp Inside Sparen"
-ValueDefault=ignore
-
-[Sp Inside Sparen Open]
-Category=1
-Description="<html>(74)Add or remove space after '(' of control statements.<br/><br/>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="(74)Ignore Sp Inside Sparen Open|(74)Add Sp Inside Sparen Open|(74)Remove Sp Inside Sparen Open|(74)Force Sp Inside Sparen Open"
-ValueDefault=ignore
-
-[Sp Inside Sparen Close]
-Category=1
-Description="<html>(75)Add or remove space before ')' of control statements.<br/><br/>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="(75)Ignore Sp Inside Sparen Close|(75)Add Sp Inside Sparen Close|(75)Remove Sp Inside Sparen Close|(75)Force Sp Inside Sparen Close"
-ValueDefault=ignore
-
-[Sp After Sparen]
-Category=1
-Description="<html>(76)Add or remove space after ')' of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_sparen=ignore|sp_after_sparen=add|sp_after_sparen=remove|sp_after_sparen=force
-ChoicesReadable="(76)Ignore Sp After Sparen|(76)Add Sp After Sparen|(76)Remove Sp After Sparen|(76)Force Sp After Sparen"
-ValueDefault=ignore
-
-[Sp Sparen Brace]
-Category=1
-Description="<html>(77)Add or remove space between ')' and '{' of of control statements.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sparen_brace=ignore|sp_sparen_brace=add|sp_sparen_brace=remove|sp_sparen_brace=force
-ChoicesReadable="(77)Ignore Sp Sparen Brace|(77)Add Sp Sparen Brace|(77)Remove Sp Sparen Brace|(77)Force Sp Sparen Brace"
-ValueDefault=ignore
-
-[Sp Invariant Paren]
-Category=1
-Description="<html>(78)(D) Add or remove space between 'invariant' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_invariant_paren=ignore|sp_invariant_paren=add|sp_invariant_paren=remove|sp_invariant_paren=force
-ChoicesReadable="(78)Ignore Sp Invariant Paren|(78)Add Sp Invariant Paren|(78)Remove Sp Invariant Paren|(78)Force Sp Invariant Paren"
-ValueDefault=ignore
-
-[Sp After Invariant Paren]
-Category=1
-Description="<html>(79)(D) Add or remove space after the ')' in 'invariant (C) c'.</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
-ChoicesReadable="(79)Ignore Sp After Invariant Paren|(79)Add Sp After Invariant Paren|(79)Remove Sp After Invariant Paren|(79)Force Sp After Invariant Paren"
-ValueDefault=ignore
-
-[Sp Special Semi]
-Category=1
-Description="<html>(80)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
-ChoicesReadable="(80)Ignore Sp Special Semi|(80)Add Sp Special Semi|(80)Remove Sp Special Semi|(80)Force Sp Special Semi"
-ValueDefault=ignore
-
-[Sp Before Semi]
-Category=1
-Description="<html>(81)Add or remove space before ';'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force
-ChoicesReadable="(81)Ignore Sp Before Semi|(81)Add Sp Before Semi|(81)Remove Sp Before Semi|(81)Force Sp Before Semi"
-ValueDefault=remove
-
-[Sp Before Semi For]
-Category=1
-Description="<html>(82)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
-ChoicesReadable="(82)Ignore Sp Before Semi For|(82)Add Sp Before Semi For|(82)Remove Sp Before Semi For|(82)Force Sp Before Semi For"
-ValueDefault=ignore
-
-[Sp Before Semi For Empty]
-Category=1
-Description="<html>(83)Add or remove space before a semicolon of an empty part of a for statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_semi_for_empty=ignore|sp_before_semi_for_empty=add|sp_before_semi_for_empty=remove|sp_before_semi_for_empty=force
-ChoicesReadable="(83)Ignore Sp Before Semi For Empty|(83)Add Sp Before Semi For Empty|(83)Remove Sp Before Semi For Empty|(83)Force Sp Before Semi For Empty"
-ValueDefault=ignore
-
-[Sp After Semi]
-Category=1
-Description="<html>(84)Add or remove space after ';', except when followed by a comment.<br/><br/>Default: add</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force
-ChoicesReadable="(84)Ignore Sp After Semi|(84)Add Sp After Semi|(84)Remove Sp After Semi|(84)Force Sp After Semi"
-ValueDefault=add
-
-[Sp After Semi For]
-Category=1
-Description="<html>(85)Add or remove space after ';' in non-empty 'for' statements.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_semi_for=ignore|sp_after_semi_for=add|sp_after_semi_for=remove|sp_after_semi_for=force
-ChoicesReadable="(85)Ignore Sp After Semi For|(85)Add Sp After Semi For|(85)Remove Sp After Semi For|(85)Force Sp After Semi For"
-ValueDefault=force
-
-[Sp After Semi For Empty]
-Category=1
-Description="<html>(86)Add or remove space after the final semicolon of an empty part of a for<br/>statement, as in '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
-ChoicesReadable="(86)Ignore Sp After Semi For Empty|(86)Add Sp After Semi For Empty|(86)Remove Sp After Semi For Empty|(86)Force Sp After Semi For Empty"
-ValueDefault=ignore
-
-[Sp Before Square]
-Category=1
-Description="<html>(87)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
-ChoicesReadable="(87)Ignore Sp Before Square|(87)Add Sp Before Square|(87)Remove Sp Before Square|(87)Force Sp Before Square"
-ValueDefault=ignore
-
-[Sp Before Vardef Square]
-Category=1
-Description="<html>(88)Add or remove space before '[' for a variable definition.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_vardef_square=ignore|sp_before_vardef_square=add|sp_before_vardef_square=remove|sp_before_vardef_square=force
-ChoicesReadable="(88)Ignore Sp Before Vardef Square|(88)Add Sp Before Vardef Square|(88)Remove Sp Before Vardef Square|(88)Force Sp Before Vardef Square"
-ValueDefault=remove
-
-[Sp Before Square Asm Block]
-Category=1
-Description="<html>(89)Add or remove space before '[' for asm block.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_square_asm_block=ignore|sp_before_square_asm_block=add|sp_before_square_asm_block=remove|sp_before_square_asm_block=force
-ChoicesReadable="(89)Ignore Sp Before Square Asm Block|(89)Add Sp Before Square Asm Block|(89)Remove Sp Before Square Asm Block|(89)Force Sp Before Square Asm Block"
-ValueDefault=ignore
-
-[Sp Before Squares]
-Category=1
-Description="<html>(90)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
-ChoicesReadable="(90)Ignore Sp Before Squares|(90)Add Sp Before Squares|(90)Remove Sp Before Squares|(90)Force Sp Before Squares"
-ValueDefault=ignore
-
-[Sp Cpp Before Struct Binding]
-Category=1
-Description="<html>(91)Add or remove space before C++17 structured bindings.</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
-ChoicesReadable="(91)Ignore Sp Cpp Before Struct Binding|(91)Add Sp Cpp Before Struct Binding|(91)Remove Sp Cpp Before Struct Binding|(91)Force Sp Cpp Before Struct Binding"
-ValueDefault=ignore
-
-[Sp Inside Square]
-Category=1
-Description="<html>(92)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
-ChoicesReadable="(92)Ignore Sp Inside Square|(92)Add Sp Inside Square|(92)Remove Sp Inside Square|(92)Force Sp Inside Square"
-ValueDefault=ignore
-
-[Sp Inside Square Empty]
-Category=1
-Description="<html>(93)Add or remove space inside '[]'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_square_empty=ignore|sp_inside_square_empty=add|sp_inside_square_empty=remove|sp_inside_square_empty=force
-ChoicesReadable="(93)Ignore Sp Inside Square Empty|(93)Add Sp Inside Square Empty|(93)Remove Sp Inside Square Empty|(93)Force Sp Inside Square Empty"
-ValueDefault=ignore
-
-[Sp Inside Square Oc Array]
-Category=1
-Description="<html>(94)(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>"
-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
-ChoicesReadable="(94)Ignore Sp Inside Square Oc Array|(94)Add Sp Inside Square Oc Array|(94)Remove Sp Inside Square Oc Array|(94)Force Sp Inside Square Oc Array"
-ValueDefault=ignore
-
-[Sp After Comma]
-Category=1
-Description="<html>(95)Add or remove space after ',', i.e. '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
-ChoicesReadable="(95)Ignore Sp After Comma|(95)Add Sp After Comma|(95)Remove Sp After Comma|(95)Force Sp After Comma"
-ValueDefault=ignore
-
-[Sp Before Comma]
-Category=1
-Description="<html>(96)Add or remove space before ','.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force
-ChoicesReadable="(96)Ignore Sp Before Comma|(96)Add Sp Before Comma|(96)Remove Sp Before Comma|(96)Force Sp Before Comma"
-ValueDefault=remove
-
-[Sp After Mdatype Commas]
-Category=1
-Description="<html>(97)(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</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
-ChoicesReadable="(97)Ignore Sp After Mdatype Commas|(97)Add Sp After Mdatype Commas|(97)Remove Sp After Mdatype Commas|(97)Force Sp After Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Before Mdatype Commas]
-Category=1
-Description="<html>(98)(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</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
-ChoicesReadable="(98)Ignore Sp Before Mdatype Commas|(98)Add Sp Before Mdatype Commas|(98)Remove Sp Before Mdatype Commas|(98)Force Sp Before Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Between Mdatype Commas]
-Category=1
-Description="<html>(99)(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</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
-ChoicesReadable="(99)Ignore Sp Between Mdatype Commas|(99)Add Sp Between Mdatype Commas|(99)Remove Sp Between Mdatype Commas|(99)Force Sp Between Mdatype Commas"
-ValueDefault=ignore
-
-[Sp Paren Comma]
-Category=1
-Description="<html>(100)Add or remove space between an open parenthesis and comma,<br/>i.e. '(,' vs. '( ,'.<br/><br/>Default: force</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force
-ChoicesReadable="(100)Ignore Sp Paren Comma|(100)Add Sp Paren Comma|(100)Remove Sp Paren Comma|(100)Force Sp Paren Comma"
-ValueDefault=force
-
-[Sp Before Ellipsis]
-Category=1
-Description="<html>(101)Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force
-ChoicesReadable="(101)Ignore Sp Before Ellipsis|(101)Add Sp Before Ellipsis|(101)Remove Sp Before Ellipsis|(101)Force Sp Before Ellipsis"
-ValueDefault=ignore
-
-[Sp Type Ellipsis]
-Category=1
-Description="<html>(102)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="(102)Ignore Sp Type Ellipsis|(102)Add Sp Type Ellipsis|(102)Remove Sp Type Ellipsis|(102)Force Sp Type Ellipsis"
-ValueDefault=ignore
-
-[Sp Type Question]
-Category=1
-Description="<html>(103)(D) Add or remove space between a type and '?'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force
-ChoicesReadable="(103)Ignore Sp Type Question|(103)Add Sp Type Question|(103)Remove Sp Type Question|(103)Force Sp Type Question"
-ValueDefault=ignore
-
-[Sp Paren Ellipsis]
-Category=1
-Description="<html>(104)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="(104)Ignore Sp Paren Ellipsis|(104)Add Sp Paren Ellipsis|(104)Remove Sp Paren Ellipsis|(104)Force Sp Paren Ellipsis"
-ValueDefault=ignore
-
-[Sp Paren Qualifier]
-Category=1
-Description="<html>(105)Add or remove space between ')' and a qualifier such as 'const'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_qualifier=ignore|sp_paren_qualifier=add|sp_paren_qualifier=remove|sp_paren_qualifier=force
-ChoicesReadable="(105)Ignore Sp Paren Qualifier|(105)Add Sp Paren Qualifier|(105)Remove Sp Paren Qualifier|(105)Force Sp Paren Qualifier"
-ValueDefault=ignore
-
-[Sp Paren Noexcept]
-Category=1
-Description="<html>(106)Add or remove space between ')' and 'noexcept'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_paren_noexcept=ignore|sp_paren_noexcept=add|sp_paren_noexcept=remove|sp_paren_noexcept=force
-ChoicesReadable="(106)Ignore Sp Paren Noexcept|(106)Add Sp Paren Noexcept|(106)Remove Sp Paren Noexcept|(106)Force Sp Paren Noexcept"
-ValueDefault=ignore
-
-[Sp After Class Colon]
-Category=1
-Description="<html>(107)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
-ChoicesReadable="(107)Ignore Sp After Class Colon|(107)Add Sp After Class Colon|(107)Remove Sp After Class Colon|(107)Force Sp After Class Colon"
-ValueDefault=ignore
-
-[Sp Before Class Colon]
-Category=1
-Description="<html>(108)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
-ChoicesReadable="(108)Ignore Sp Before Class Colon|(108)Add Sp Before Class Colon|(108)Remove Sp Before Class Colon|(108)Force Sp Before Class Colon"
-ValueDefault=ignore
-
-[Sp After Constr Colon]
-Category=1
-Description="<html>(109)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
-ChoicesReadable="(109)Ignore Sp After Constr Colon|(109)Add Sp After Constr Colon|(109)Remove Sp After Constr Colon|(109)Force Sp After Constr Colon"
-ValueDefault=ignore
-
-[Sp Before Constr Colon]
-Category=1
-Description="<html>(110)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
-ChoicesReadable="(110)Ignore Sp Before Constr Colon|(110)Add Sp Before Constr Colon|(110)Remove Sp Before Constr Colon|(110)Force Sp Before Constr Colon"
-ValueDefault=ignore
-
-[Sp Before Case Colon]
-Category=1
-Description="<html>(111)Add or remove space before case ':'.<br/><br/>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
-ChoicesReadable="(111)Ignore Sp Before Case Colon|(111)Add Sp Before Case Colon|(111)Remove Sp Before Case Colon|(111)Force Sp Before Case Colon"
-ValueDefault=remove
-
-[Sp After Operator]
-Category=1
-Description="<html>(112)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
-ChoicesReadable="(112)Ignore Sp After Operator|(112)Add Sp After Operator|(112)Remove Sp After Operator|(112)Force Sp After Operator"
-ValueDefault=ignore
-
-[Sp After Operator Sym]
-Category=1
-Description="<html>(113)Add or remove space between the operator symbol and the open parenthesis, as<br/>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
-ChoicesReadable="(113)Ignore Sp After Operator Sym|(113)Add Sp After Operator Sym|(113)Remove Sp After Operator Sym|(113)Force Sp After Operator Sym"
-ValueDefault=ignore
-
-[Sp After Operator Sym Empty]
-Category=1
-Description="<html>(114)Overrides sp_after_operator_sym when the operator has no arguments, as in<br/>'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
-ChoicesReadable="(114)Ignore Sp After Operator Sym Empty|(114)Add Sp After Operator Sym Empty|(114)Remove Sp After Operator Sym Empty|(114)Force Sp After Operator Sym Empty"
-ValueDefault=ignore
-
-[Sp After Cast]
-Category=1
-Description="<html>(115)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>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force
-ChoicesReadable="(115)Ignore Sp After Cast|(115)Add Sp After Cast|(115)Remove Sp After Cast|(115)Force Sp After Cast"
-ValueDefault=ignore
-
-[Sp Inside Paren Cast]
-Category=1
-Description="<html>(116)Add or remove spaces inside cast parentheses.</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
-ChoicesReadable="(116)Ignore Sp Inside Paren Cast|(116)Add Sp Inside Paren Cast|(116)Remove Sp Inside Paren Cast|(116)Force Sp Inside Paren Cast"
-ValueDefault=ignore
-
-[Sp Cpp Cast Paren]
-Category=1
-Description="<html>(117)Add or remove space between the type and open parenthesis in a C++ cast,<br/>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
-ChoicesReadable="(117)Ignore Sp Cpp Cast Paren|(117)Add Sp Cpp Cast Paren|(117)Remove Sp Cpp Cast Paren|(117)Force Sp Cpp Cast Paren"
-ValueDefault=ignore
-
-[Sp Sizeof Paren]
-Category=1
-Description="<html>(118)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
-ChoicesReadable="(118)Ignore Sp Sizeof Paren|(118)Add Sp Sizeof Paren|(118)Remove Sp Sizeof Paren|(118)Force Sp Sizeof Paren"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis]
-Category=1
-Description="<html>(119)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="(119)Ignore Sp Sizeof Ellipsis|(119)Add Sp Sizeof Ellipsis|(119)Remove Sp Sizeof Ellipsis|(119)Force Sp Sizeof Ellipsis"
-ValueDefault=ignore
-
-[Sp Sizeof Ellipsis Paren]
-Category=1
-Description="<html>(120)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="(120)Ignore Sp Sizeof Ellipsis Paren|(120)Add Sp Sizeof Ellipsis Paren|(120)Remove Sp Sizeof Ellipsis Paren|(120)Force Sp Sizeof Ellipsis Paren"
-ValueDefault=ignore
-
-[Sp Decltype Paren]
-Category=1
-Description="<html>(121)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="(121)Ignore Sp Decltype Paren|(121)Add Sp Decltype Paren|(121)Remove Sp Decltype Paren|(121)Force Sp Decltype Paren"
-ValueDefault=ignore
-
-[Sp After Tag]
-Category=1
-Description="<html>(122)(Pawn) Add or remove space after the tag keyword.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_tag=ignore|sp_after_tag=add|sp_after_tag=remove|sp_after_tag=force
-ChoicesReadable="(122)Ignore Sp After Tag|(122)Add Sp After Tag|(122)Remove Sp After Tag|(122)Force Sp After Tag"
-ValueDefault=ignore
-
-[Sp Inside Braces Enum]
-Category=1
-Description="<html>(123)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
-ChoicesReadable="(123)Ignore Sp Inside Braces Enum|(123)Add Sp Inside Braces Enum|(123)Remove Sp Inside Braces Enum|(123)Force Sp Inside Braces Enum"
-ValueDefault=ignore
-
-[Sp Inside Braces Struct]
-Category=1
-Description="<html>(124)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
-ChoicesReadable="(124)Ignore Sp Inside Braces Struct|(124)Add Sp Inside Braces Struct|(124)Remove Sp Inside Braces Struct|(124)Force Sp Inside Braces Struct"
-ValueDefault=ignore
-
-[Sp Inside Braces Oc Dict]
-Category=1
-Description="<html>(125)(OC) Add or remove space inside Objective-C 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
-ChoicesReadable="(125)Ignore Sp Inside Braces Oc Dict|(125)Add Sp Inside Braces Oc Dict|(125)Remove Sp Inside Braces Oc Dict|(125)Force Sp Inside Braces Oc Dict"
-ValueDefault=ignore
-
-[Sp After Type Brace Init Lst Open]
-Category=1
-Description="<html>(126)Add or remove space after open brace in an unnamed temporary<br/>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
-ChoicesReadable="(126)Ignore Sp After Type Brace Init Lst Open|(126)Add Sp After Type Brace Init Lst Open|(126)Remove Sp After Type Brace Init Lst Open|(126)Force Sp After Type Brace Init Lst Open"
-ValueDefault=ignore
-
-[Sp Before Type Brace Init Lst Close]
-Category=1
-Description="<html>(127)Add or remove space before close brace in an unnamed temporary<br/>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
-ChoicesReadable="(127)Ignore Sp Before Type Brace Init Lst Close|(127)Add Sp Before Type Brace Init Lst Close|(127)Remove Sp Before Type Brace Init Lst Close|(127)Force Sp Before Type Brace Init Lst Close"
-ValueDefault=ignore
-
-[Sp Inside Type Brace Init Lst]
-Category=1
-Description="<html>(128)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
-ChoicesReadable="(128)Ignore Sp Inside Type Brace Init Lst|(128)Add Sp Inside Type Brace Init Lst|(128)Remove Sp Inside Type Brace Init Lst|(128)Force Sp Inside Type Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Inside Braces]
-Category=1
-Description="<html>(129)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
-ChoicesReadable="(129)Ignore Sp Inside Braces|(129)Add Sp Inside Braces|(129)Remove Sp Inside Braces|(129)Force Sp Inside Braces"
-ValueDefault=ignore
-
-[Sp Inside Braces Empty]
-Category=1
-Description="<html>(130)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
-ChoicesReadable="(130)Ignore Sp Inside Braces Empty|(130)Add Sp Inside Braces Empty|(130)Remove Sp Inside Braces Empty|(130)Force Sp Inside Braces Empty"
-ValueDefault=ignore
-
-[Sp Trailing Return]
-Category=1
-Description="<html>(131)Add or remove space around trailing return operator '-&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_trailing_return=ignore|sp_trailing_return=add|sp_trailing_return=remove|sp_trailing_return=force
-ChoicesReadable="(131)Ignore Sp Trailing Return|(131)Add Sp Trailing Return|(131)Remove Sp Trailing Return|(131)Force Sp Trailing Return"
-ValueDefault=ignore
-
-[Sp Type Func]
-Category=1
-Description="<html>(132)Add or remove space between return type and function name. A minimum of 1<br/>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
-ChoicesReadable="(132)Ignore Sp Type Func|(132)Add Sp Type Func|(132)Remove Sp Type Func|(132)Force Sp Type Func"
-ValueDefault=ignore
-
-[Sp Type Brace Init Lst]
-Category=1
-Description="<html>(133)Add or remove space between type and open brace of an unnamed temporary<br/>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
-ChoicesReadable="(133)Ignore Sp Type Brace Init Lst|(133)Add Sp Type Brace Init Lst|(133)Remove Sp Type Brace Init Lst|(133)Force Sp Type Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Func Proto Paren]
-Category=1
-Description="<html>(134)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
-ChoicesReadable="(134)Ignore Sp Func Proto Paren|(134)Add Sp Func Proto Paren|(134)Remove Sp Func Proto Paren|(134)Force Sp Func Proto Paren"
-ValueDefault=ignore
-
-[Sp Func Proto Paren Empty]
-Category=1
-Description="<html>(135)Add or remove space between function name and '()' on function declaration<br/>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
-ChoicesReadable="(135)Ignore Sp Func Proto Paren Empty|(135)Add Sp Func Proto Paren Empty|(135)Remove Sp Func Proto Paren Empty|(135)Force Sp Func Proto Paren Empty"
-ValueDefault=ignore
-
-[Sp Func Type Paren]
-Category=1
-Description="<html>(136)Add or remove space between function name and '(' with a typedef specifier.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_func_type_paren=ignore|sp_func_type_paren=add|sp_func_type_paren=remove|sp_func_type_paren=force
-ChoicesReadable="(136)Ignore Sp Func Type Paren|(136)Add Sp Func Type Paren|(136)Remove Sp Func Type Paren|(136)Force Sp Func Type Paren"
-ValueDefault=ignore
-
-[Sp Func Def Paren]
-Category=1
-Description="<html>(137)Add or remove space between alias name and '(' of a non-pointer function type typedef.</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
-ChoicesReadable="(137)Ignore Sp Func Def Paren|(137)Add Sp Func Def Paren|(137)Remove Sp Func Def Paren|(137)Force Sp Func Def Paren"
-ValueDefault=ignore
-
-[Sp Func Def Paren Empty]
-Category=1
-Description="<html>(138)Add or remove space between function name and '()' on function definition<br/>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
-ChoicesReadable="(138)Ignore Sp Func Def Paren Empty|(138)Add Sp Func Def Paren Empty|(138)Remove Sp Func Def Paren Empty|(138)Force Sp Func Def Paren Empty"
-ValueDefault=ignore
-
-[Sp Inside Fparens]
-Category=1
-Description="<html>(139)Add or remove space inside empty function '()'.<br/>Overrides sp_after_angle unless use_sp_after_angle_always is set to true.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_fparens=ignore|sp_inside_fparens=add|sp_inside_fparens=remove|sp_inside_fparens=force
-ChoicesReadable="(139)Ignore Sp Inside Fparens|(139)Add Sp Inside Fparens|(139)Remove Sp Inside Fparens|(139)Force Sp Inside Fparens"
-ValueDefault=ignore
-
-[Sp Inside Fparen]
-Category=1
-Description="<html>(140)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
-ChoicesReadable="(140)Ignore Sp Inside Fparen|(140)Add Sp Inside Fparen|(140)Remove Sp Inside Fparen|(140)Force Sp Inside Fparen"
-ValueDefault=ignore
-
-[Sp Inside Tparen]
-Category=1
-Description="<html>(141)Add or remove space inside the first parentheses in a function type, as in<br/>'void (*x)(...)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_tparen=ignore|sp_inside_tparen=add|sp_inside_tparen=remove|sp_inside_tparen=force
-ChoicesReadable="(141)Ignore Sp Inside Tparen|(141)Add Sp Inside Tparen|(141)Remove Sp Inside Tparen|(141)Force Sp Inside Tparen"
-ValueDefault=ignore
-
-[Sp After Tparen Close]
-Category=1
-Description="<html>(142)Add or remove space between the ')' and '(' in a function type, as in<br/>'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
-ChoicesReadable="(142)Ignore Sp After Tparen Close|(142)Add Sp After Tparen Close|(142)Remove Sp After Tparen Close|(142)Force Sp After Tparen Close"
-ValueDefault=ignore
-
-[Sp Square Fparen]
-Category=1
-Description="<html>(143)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
-ChoicesReadable="(143)Ignore Sp Square Fparen|(143)Add Sp Square Fparen|(143)Remove Sp Square Fparen|(143)Force Sp Square Fparen"
-ValueDefault=ignore
-
-[Sp Fparen Brace]
-Category=1
-Description="<html>(144)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
-ChoicesReadable="(144)Ignore Sp Fparen Brace|(144)Add Sp Fparen Brace|(144)Remove Sp Fparen Brace|(144)Force Sp Fparen Brace"
-ValueDefault=ignore
-
-[Sp Fparen Brace Initializer]
-Category=1
-Description="<html>(145)Add or remove space between ')' and '{' of a function call in object<br/>initialization.<br/><br/>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
-ChoicesReadable="(145)Ignore Sp Fparen Brace Initializer|(145)Add Sp Fparen Brace Initializer|(145)Remove Sp Fparen Brace Initializer|(145)Force Sp Fparen Brace Initializer"
-ValueDefault=ignore
-
-[Sp Fparen Dbrace]
-Category=1
-Description="<html>(146)(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
-ChoicesReadable="(146)Ignore Sp Fparen Dbrace|(146)Add Sp Fparen Dbrace|(146)Remove Sp Fparen Dbrace|(146)Force Sp Fparen Dbrace"
-ValueDefault=ignore
-
-[Sp Func Call Paren]
-Category=1
-Description="<html>(147)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
-ChoicesReadable="(147)Ignore Sp Func Call Paren|(147)Add Sp Func Call Paren|(147)Remove Sp Func Call Paren|(147)Force Sp Func Call Paren"
-ValueDefault=ignore
-
-[Sp Func Call Paren Empty]
-Category=1
-Description="<html>(148)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>"
-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
-ChoicesReadable="(148)Ignore Sp Func Call Paren Empty|(148)Add Sp Func Call Paren Empty|(148)Remove Sp Func Call Paren Empty|(148)Force Sp Func Call Paren Empty"
-ValueDefault=ignore
-
-[Sp Func Call User Paren]
-Category=1
-Description="<html>(149)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>"
-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
-ChoicesReadable="(149)Ignore Sp Func Call User Paren|(149)Add Sp Func Call User Paren|(149)Remove Sp Func Call User Paren|(149)Force Sp Func Call User Paren"
-ValueDefault=ignore
-
-[Sp Func Call User Inside Fparen]
-Category=1
-Description="<html>(150)Add or remove space inside user function '(' and ')'.</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
-ChoicesReadable="(150)Ignore Sp Func Call User Inside Fparen|(150)Add Sp Func Call User Inside Fparen|(150)Remove Sp Func Call User Inside Fparen|(150)Force Sp Func Call User Inside Fparen"
-ValueDefault=ignore
-
-[Sp Func Call User Paren Paren]
-Category=1
-Description="<html>(151)Add or remove space between nested parentheses with user functions,<br/>i.e. '((' vs. '( ('.</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
-ChoicesReadable="(151)Ignore Sp Func Call User Paren Paren|(151)Add Sp Func Call User Paren Paren|(151)Remove Sp Func Call User Paren Paren|(151)Force Sp Func Call User Paren Paren"
-ValueDefault=ignore
-
-[Sp Func Class Paren]
-Category=1
-Description="<html>(152)Add or remove space between a constructor/destructor and the open<br/>parenthesis.</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
-ChoicesReadable="(152)Ignore Sp Func Class Paren|(152)Add Sp Func Class Paren|(152)Remove Sp Func Class Paren|(152)Force Sp Func Class Paren"
-ValueDefault=ignore
-
-[Sp Func Class Paren Empty]
-Category=1
-Description="<html>(153)Add or remove space between a constructor without parameters or destructor<br/>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
-ChoicesReadable="(153)Ignore Sp Func Class Paren Empty|(153)Add Sp Func Class Paren Empty|(153)Remove Sp Func Class Paren Empty|(153)Force Sp Func Class Paren Empty"
-ValueDefault=ignore
-
-[Sp Return Paren]
-Category=1
-Description="<html>(154)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
-ChoicesReadable="(154)Ignore Sp Return Paren|(154)Add Sp Return Paren|(154)Remove Sp Return Paren|(154)Force Sp Return Paren"
-ValueDefault=ignore
-
-[Sp Return Brace]
-Category=1
-Description="<html>(155)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="(155)Ignore Sp Return Brace|(155)Add Sp Return Brace|(155)Remove Sp Return Brace|(155)Force Sp Return Brace"
-ValueDefault=ignore
-
-[Sp Attribute Paren]
-Category=1
-Description="<html>(156)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
-ChoicesReadable="(156)Ignore Sp Attribute Paren|(156)Add Sp Attribute Paren|(156)Remove Sp Attribute Paren|(156)Force Sp Attribute Paren"
-ValueDefault=ignore
-
-[Sp Defined Paren]
-Category=1
-Description="<html>(157)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
-ChoicesReadable="(157)Ignore Sp Defined Paren|(157)Add Sp Defined Paren|(157)Remove Sp Defined Paren|(157)Force Sp Defined Paren"
-ValueDefault=ignore
-
-[Sp Throw Paren]
-Category=1
-Description="<html>(158)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
-ChoicesReadable="(158)Ignore Sp Throw Paren|(158)Add Sp Throw Paren|(158)Remove Sp Throw Paren|(158)Force Sp Throw Paren"
-ValueDefault=ignore
-
-[Sp After Throw]
-Category=1
-Description="<html>(159)Add or remove space between 'throw' and anything other than '(' as in<br/>'@throw [...];'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_throw=ignore|sp_after_throw=add|sp_after_throw=remove|sp_after_throw=force
-ChoicesReadable="(159)Ignore Sp After Throw|(159)Add Sp After Throw|(159)Remove Sp After Throw|(159)Force Sp After Throw"
-ValueDefault=ignore
-
-[Sp Catch Paren]
-Category=1
-Description="<html>(160)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
-ChoicesReadable="(160)Ignore Sp Catch Paren|(160)Add Sp Catch Paren|(160)Remove Sp Catch Paren|(160)Force Sp Catch Paren"
-ValueDefault=ignore
-
-[Sp Oc Catch Paren]
-Category=1
-Description="<html>(161)(OC) Add or remove space between '@catch' and '('<br/>in '@catch (something) { }'. 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
-ChoicesReadable="(161)Ignore Sp Oc Catch Paren|(161)Add Sp Oc Catch Paren|(161)Remove Sp Oc Catch Paren|(161)Force Sp Oc Catch Paren"
-ValueDefault=ignore
-
-[Sp Before Oc Proto List]
-Category=1
-Description="<html>(162)(OC) Add or remove space before Objective-C protocol list<br/>as in '@protocol Protocol&lt;here&gt;&lt;Protocol_A&gt;' or '@interface MyClass : NSObject&lt;here&gt;&lt;MyProtocol&gt;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_proto_list=ignore|sp_before_oc_proto_list=add|sp_before_oc_proto_list=remove|sp_before_oc_proto_list=force
-ChoicesReadable="(162)Ignore Sp Before Oc Proto List|(162)Add Sp Before Oc Proto List|(162)Remove Sp Before Oc Proto List|(162)Force Sp Before Oc Proto List"
-ValueDefault=ignore
-
-[Sp Oc Classname Paren]
-Category=1
-Description="<html>(163)(OC) Add or remove space between class name and '('<br/>in '@interface className(categoryName)&lt;ProtocolName&gt;:BaseClass'</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_oc_classname_paren=ignore|sp_oc_classname_paren=add|sp_oc_classname_paren=remove|sp_oc_classname_paren=force
-ChoicesReadable="(163)Ignore Sp Oc Classname Paren|(163)Add Sp Oc Classname Paren|(163)Remove Sp Oc Classname Paren|(163)Force Sp Oc Classname Paren"
-ValueDefault=ignore
-
-[Sp Version Paren]
-Category=1
-Description="<html>(164)(D) Add or remove space between 'version' and '('<br/>in 'version (something) { }'. 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
-ChoicesReadable="(164)Ignore Sp Version Paren|(164)Add Sp Version Paren|(164)Remove Sp Version Paren|(164)Force Sp Version Paren"
-ValueDefault=ignore
-
-[Sp Scope Paren]
-Category=1
-Description="<html>(165)(D) Add or remove space between 'scope' and '('<br/>in 'scope (something) { }'. 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
-ChoicesReadable="(165)Ignore Sp Scope Paren|(165)Add Sp Scope Paren|(165)Remove Sp Scope Paren|(165)Force Sp Scope Paren"
-ValueDefault=ignore
-
-[Sp Super Paren]
-Category=1
-Description="<html>(166)Add or remove space between 'super' and '(' in 'super (something)'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_super_paren=ignore|sp_super_paren=add|sp_super_paren=remove|sp_super_paren=force
-ChoicesReadable="(166)Ignore Sp Super Paren|(166)Add Sp Super Paren|(166)Remove Sp Super Paren|(166)Force Sp Super Paren"
-ValueDefault=remove
-
-[Sp This Paren]
-Category=1
-Description="<html>(167)Add or remove space between 'this' and '(' in 'this (something)'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_this_paren=ignore|sp_this_paren=add|sp_this_paren=remove|sp_this_paren=force
-ChoicesReadable="(167)Ignore Sp This Paren|(167)Add Sp This Paren|(167)Remove Sp This Paren|(167)Force Sp This Paren"
-ValueDefault=remove
-
-[Sp Macro]
-Category=1
-Description="<html>(168)Add or remove space between a macro name and its definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force
-ChoicesReadable="(168)Ignore Sp Macro|(168)Add Sp Macro|(168)Remove Sp Macro|(168)Force Sp Macro"
-ValueDefault=ignore
-
-[Sp Macro Func]
-Category=1
-Description="<html>(169)Add or remove space between a macro function ')' and its definition.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_macro_func=ignore|sp_macro_func=add|sp_macro_func=remove|sp_macro_func=force
-ChoicesReadable="(169)Ignore Sp Macro Func|(169)Add Sp Macro Func|(169)Remove Sp Macro Func|(169)Force Sp Macro Func"
-ValueDefault=ignore
-
-[Sp Else Brace]
-Category=1
-Description="<html>(170)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
-ChoicesReadable="(170)Ignore Sp Else Brace|(170)Add Sp Else Brace|(170)Remove Sp Else Brace|(170)Force Sp Else Brace"
-ValueDefault=ignore
-
-[Sp Brace Else]
-Category=1
-Description="<html>(171)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
-ChoicesReadable="(171)Ignore Sp Brace Else|(171)Add Sp Brace Else|(171)Remove Sp Brace Else|(171)Force Sp Brace Else"
-ValueDefault=ignore
-
-[Sp Brace Typedef]
-Category=1
-Description="<html>(172)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
-ChoicesReadable="(172)Ignore Sp Brace Typedef|(172)Add Sp Brace Typedef|(172)Remove Sp Brace Typedef|(172)Force Sp Brace Typedef"
-ValueDefault=ignore
-
-[Sp Catch Brace]
-Category=1
-Description="<html>(173)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>"
-Enabled=false
-EditorType=multiple
-Choices=sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force
-ChoicesReadable="(173)Ignore Sp Catch Brace|(173)Add Sp Catch Brace|(173)Remove Sp Catch Brace|(173)Force Sp Catch Brace"
-ValueDefault=ignore
-
-[Sp Oc Catch Brace]
-Category=1
-Description="<html>(174)(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>"
-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
-ChoicesReadable="(174)Ignore Sp Oc Catch Brace|(174)Add Sp Oc Catch Brace|(174)Remove Sp Oc Catch Brace|(174)Force Sp Oc Catch Brace"
-ValueDefault=ignore
-
-[Sp Brace Catch]
-Category=1
-Description="<html>(175)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
-ChoicesReadable="(175)Ignore Sp Brace Catch|(175)Add Sp Brace Catch|(175)Remove Sp Brace Catch|(175)Force Sp Brace Catch"
-ValueDefault=ignore
-
-[Sp Oc Brace Catch]
-Category=1
-Description="<html>(176)(OC) 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
-ChoicesReadable="(176)Ignore Sp Oc Brace Catch|(176)Add Sp Oc Brace Catch|(176)Remove Sp Oc Brace Catch|(176)Force Sp Oc Brace Catch"
-ValueDefault=ignore
-
-[Sp Finally Brace]
-Category=1
-Description="<html>(177)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
-ChoicesReadable="(177)Ignore Sp Finally Brace|(177)Add Sp Finally Brace|(177)Remove Sp Finally Brace|(177)Force Sp Finally Brace"
-ValueDefault=ignore
-
-[Sp Brace Finally]
-Category=1
-Description="<html>(178)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
-ChoicesReadable="(178)Ignore Sp Brace Finally|(178)Add Sp Brace Finally|(178)Remove Sp Brace Finally|(178)Force Sp Brace Finally"
-ValueDefault=ignore
-
-[Sp Try Brace]
-Category=1
-Description="<html>(179)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
-ChoicesReadable="(179)Ignore Sp Try Brace|(179)Add Sp Try Brace|(179)Remove Sp Try Brace|(179)Force Sp Try Brace"
-ValueDefault=ignore
-
-[Sp Getset Brace]
-Category=1
-Description="<html>(180)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
-ChoicesReadable="(180)Ignore Sp Getset Brace|(180)Add Sp Getset Brace|(180)Remove Sp Getset Brace|(180)Force Sp Getset Brace"
-ValueDefault=ignore
-
-[Sp Word Brace Init Lst]
-Category=1
-Description="<html>(181)Add or remove space between a variable and '{' for C++ uniform<br/>initialization.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_word_brace_init_lst=ignore|sp_word_brace_init_lst=add|sp_word_brace_init_lst=remove|sp_word_brace_init_lst=force
-ChoicesReadable="(181)Ignore Sp Word Brace Init Lst|(181)Add Sp Word Brace Init Lst|(181)Remove Sp Word Brace Init Lst|(181)Force Sp Word Brace Init Lst"
-ValueDefault=ignore
-
-[Sp Word Brace Ns]
-Category=1
-Description="<html>(182)Add or remove space between a variable and '{' for a namespace.<br/><br/>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
-ChoicesReadable="(182)Ignore Sp Word Brace Ns|(182)Add Sp Word Brace Ns|(182)Remove Sp Word Brace Ns|(182)Force Sp Word Brace Ns"
-ValueDefault=add
-
-[Sp Before Dc]
-Category=1
-Description="<html>(183)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
-ChoicesReadable="(183)Ignore Sp Before Dc|(183)Add Sp Before Dc|(183)Remove Sp Before Dc|(183)Force Sp Before Dc"
-ValueDefault=ignore
-
-[Sp After Dc]
-Category=1
-Description="<html>(184)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
-ChoicesReadable="(184)Ignore Sp After Dc|(184)Add Sp After Dc|(184)Remove Sp After Dc|(184)Force Sp After Dc"
-ValueDefault=ignore
-
-[Sp D Array Colon]
-Category=1
-Description="<html>(185)(D) 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
-ChoicesReadable="(185)Ignore Sp D Array Colon|(185)Add Sp D Array Colon|(185)Remove Sp D Array Colon|(185)Force Sp D Array Colon"
-ValueDefault=ignore
-
-[Sp Not]
-Category=1
-Description="<html>(186)Add or remove space after the '!' (not) unary operator.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force
-ChoicesReadable="(186)Ignore Sp Not|(186)Add Sp Not|(186)Remove Sp Not|(186)Force Sp Not"
-ValueDefault=remove
-
-[Sp Inv]
-Category=1
-Description="<html>(187)Add or remove space after the '~' (invert) unary operator.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force
-ChoicesReadable="(187)Ignore Sp Inv|(187)Add Sp Inv|(187)Remove Sp Inv|(187)Force Sp Inv"
-ValueDefault=remove
-
-[Sp Addr]
-Category=1
-Description="<html>(188)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>"
-Enabled=false
-EditorType=multiple
-Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force
-ChoicesReadable="(188)Ignore Sp Addr|(188)Add Sp Addr|(188)Remove Sp Addr|(188)Force Sp Addr"
-ValueDefault=remove
-
-[Sp Member]
-Category=1
-Description="<html>(189)Add or remove space around the '.' or '-&gt;' operators.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force
-ChoicesReadable="(189)Ignore Sp Member|(189)Add Sp Member|(189)Remove Sp Member|(189)Force Sp Member"
-ValueDefault=remove
-
-[Sp Deref]
-Category=1
-Description="<html>(190)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>"
-Enabled=false
-EditorType=multiple
-Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force
-ChoicesReadable="(190)Ignore Sp Deref|(190)Add Sp Deref|(190)Remove Sp Deref|(190)Force Sp Deref"
-ValueDefault=remove
-
-[Sp Sign]
-Category=1
-Description="<html>(191)Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.<br/><br/>Default: remove</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force
-ChoicesReadable="(191)Ignore Sp Sign|(191)Add Sp Sign|(191)Remove Sp Sign|(191)Force Sp Sign"
-ValueDefault=remove
-
-[Sp Incdec]
-Category=1
-Description="<html>(192)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>"
-Enabled=false
-EditorType=multiple
-Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force
-ChoicesReadable="(192)Ignore Sp Incdec|(192)Add Sp Incdec|(192)Remove Sp Incdec|(192)Force Sp Incdec"
-ValueDefault=remove
-
-[Sp Before Nl Cont]
-Category=1
-Description="<html>(193)Add or remove space before a backslash-newline at the end of a line.<br/><br/>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
-ChoicesReadable="(193)Ignore Sp Before Nl Cont|(193)Add Sp Before Nl Cont|(193)Remove Sp Before Nl Cont|(193)Force Sp Before Nl Cont"
-ValueDefault=add
-
-[Sp After Oc Scope]
-Category=1
-Description="<html>(194)(OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'<br/>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
-ChoicesReadable="(194)Ignore Sp After Oc Scope|(194)Add Sp After Oc Scope|(194)Remove Sp After Oc Scope|(194)Force Sp After Oc Scope"
-ValueDefault=ignore
-
-[Sp After Oc Colon]
-Category=1
-Description="<html>(195)(OC) Add or remove space after the colon in message specs,<br/>i.e. '-(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
-ChoicesReadable="(195)Ignore Sp After Oc Colon|(195)Add Sp After Oc Colon|(195)Remove Sp After Oc Colon|(195)Force Sp After Oc Colon"
-ValueDefault=ignore
-
-[Sp Before Oc Colon]
-Category=1
-Description="<html>(196)(OC) Add or remove space before the colon in message specs,<br/>i.e. '-(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
-ChoicesReadable="(196)Ignore Sp Before Oc Colon|(196)Add Sp Before Oc Colon|(196)Remove Sp Before Oc Colon|(196)Force Sp Before Oc Colon"
-ValueDefault=ignore
-
-[Sp After Oc Dict Colon]
-Category=1
-Description="<html>(197)(OC) 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
-ChoicesReadable="(197)Ignore Sp After Oc Dict Colon|(197)Add Sp After Oc Dict Colon|(197)Remove Sp After Oc Dict Colon|(197)Force Sp After Oc Dict Colon"
-ValueDefault=ignore
-
-[Sp Before Oc Dict Colon]
-Category=1
-Description="<html>(198)(OC) 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
-ChoicesReadable="(198)Ignore Sp Before Oc Dict Colon|(198)Add Sp Before Oc Dict Colon|(198)Remove Sp Before Oc Dict Colon|(198)Force Sp Before Oc Dict Colon"
-ValueDefault=ignore
-
-[Sp After Send Oc Colon]
-Category=1
-Description="<html>(199)(OC) Add or remove space after the colon in message specs,<br/>i.e. '[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
-ChoicesReadable="(199)Ignore Sp After Send Oc Colon|(199)Add Sp After Send Oc Colon|(199)Remove Sp After Send Oc Colon|(199)Force Sp After Send Oc Colon"
-ValueDefault=ignore
-
-[Sp Before Send Oc Colon]
-Category=1
-Description="<html>(200)(OC) Add or remove space before the colon in message specs,<br/>i.e. '[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
-ChoicesReadable="(200)Ignore Sp Before Send Oc Colon|(200)Add Sp Before Send Oc Colon|(200)Remove Sp Before Send Oc Colon|(200)Force Sp Before Send Oc Colon"
-ValueDefault=ignore
-
-[Sp After Oc Type]
-Category=1
-Description="<html>(201)(OC) Add or remove space after the (type) in message specs,<br/>i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_type=ignore|sp_after_oc_type=add|sp_after_oc_type=remove|sp_after_oc_type=force
-ChoicesReadable="(201)Ignore Sp After Oc Type|(201)Add Sp After Oc Type|(201)Remove Sp After Oc Type|(201)Force Sp After Oc Type"
-ValueDefault=ignore
-
-[Sp After Oc Return Type]
-Category=1
-Description="<html>(202)(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>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_return_type=ignore|sp_after_oc_return_type=add|sp_after_oc_return_type=remove|sp_after_oc_return_type=force
-ChoicesReadable="(202)Ignore Sp After Oc Return Type|(202)Add Sp After Oc Return Type|(202)Remove Sp After Oc Return Type|(202)Force Sp After Oc Return Type"
-ValueDefault=ignore
-
-[Sp After Oc At Sel]
-Category=1
-Description="<html>(203)(OC) Add or remove space between '@selector' and '(',<br/>i.e. '@selector(msgName)' vs. '@selector (msgName)'.<br/>Also applies to '@protocol()' constructs.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_at_sel=ignore|sp_after_oc_at_sel=add|sp_after_oc_at_sel=remove|sp_after_oc_at_sel=force
-ChoicesReadable="(203)Ignore Sp After Oc At Sel|(203)Add Sp After Oc At Sel|(203)Remove Sp After Oc At Sel|(203)Force Sp After Oc At Sel"
-ValueDefault=ignore
-
-[Sp After Oc At Sel Parens]
-Category=1
-Description="<html>(204)(OC) Add or remove space between '@selector(x)' and the following word,<br/>i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_at_sel_parens=ignore|sp_after_oc_at_sel_parens=add|sp_after_oc_at_sel_parens=remove|sp_after_oc_at_sel_parens=force
-ChoicesReadable="(204)Ignore Sp After Oc At Sel Parens|(204)Add Sp After Oc At Sel Parens|(204)Remove Sp After Oc At Sel Parens|(204)Force Sp After Oc At Sel Parens"
-ValueDefault=ignore
-
-[Sp Inside Oc At Sel Parens]
-Category=1
-Description="<html>(205)(OC) Add or remove space inside '@selector' parentheses,<br/>i.e. '@selector(foo)' vs. '@selector( foo )'.<br/>Also applies to '@protocol()' constructs.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_inside_oc_at_sel_parens=ignore|sp_inside_oc_at_sel_parens=add|sp_inside_oc_at_sel_parens=remove|sp_inside_oc_at_sel_parens=force
-ChoicesReadable="(205)Ignore Sp Inside Oc At Sel Parens|(205)Add Sp Inside Oc At Sel Parens|(205)Remove Sp Inside Oc At Sel Parens|(205)Force Sp Inside Oc At Sel Parens"
-ValueDefault=ignore
-
-[Sp Before Oc Block Caret]
-Category=1
-Description="<html>(206)(OC) Add or remove space before a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_before_oc_block_caret=ignore|sp_before_oc_block_caret=add|sp_before_oc_block_caret=remove|sp_before_oc_block_caret=force
-ChoicesReadable="(206)Ignore Sp Before Oc Block Caret|(206)Add Sp Before Oc Block Caret|(206)Remove Sp Before Oc Block Caret|(206)Force Sp Before Oc Block Caret"
-ValueDefault=ignore
-
-[Sp After Oc Block Caret]
-Category=1
-Description="<html>(207)(OC) Add or remove space after a block pointer caret,<br/>i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_after_oc_block_caret=ignore|sp_after_oc_block_caret=add|sp_after_oc_block_caret=remove|sp_after_oc_block_caret=force
-ChoicesReadable="(207)Ignore Sp After Oc Block Caret|(207)Add Sp After Oc Block Caret|(207)Remove Sp After Oc Block Caret|(207)Force Sp After Oc Block Caret"
-ValueDefault=ignore
-
-[Sp After Oc Msg Receiver]
-Category=1
-Description="<html>(208)(OC) Add or remove space between the receiver and selector in a message,<br/>as in '[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
-ChoicesReadable="(208)Ignore Sp After Oc Msg Receiver|(208)Add Sp After Oc Msg Receiver|(208)Remove Sp After Oc Msg Receiver|(208)Force Sp After Oc Msg Receiver"
-ValueDefault=ignore
-
-[Sp After Oc Property]
-Category=1
-Description="<html>(209)(OC) 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
-ChoicesReadable="(209)Ignore Sp After Oc Property|(209)Add Sp After Oc Property|(209)Remove Sp After Oc Property|(209)Force Sp After Oc Property"
-ValueDefault=ignore
-
-[Sp After Oc Synchronized]
-Category=1
-Description="<html>(210)(OC) Add or remove space between '@synchronized' and the open parenthesis,<br/>i.e. '@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
-ChoicesReadable="(210)Ignore Sp After Oc Synchronized|(210)Add Sp After Oc Synchronized|(210)Remove Sp After Oc Synchronized|(210)Force Sp After Oc Synchronized"
-ValueDefault=ignore
-
-[Sp Cond Colon]
-Category=1
-Description="<html>(211)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
-ChoicesReadable="(211)Ignore Sp Cond Colon|(211)Add Sp Cond Colon|(211)Remove Sp Cond Colon|(211)Force Sp Cond Colon"
-ValueDefault=ignore
-
-[Sp Cond Colon Before]
-Category=1
-Description="<html>(212)Add or remove space before the ':' in 'b ? t : f'.<br/><br/>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
-ChoicesReadable="(212)Ignore Sp Cond Colon Before|(212)Add Sp Cond Colon Before|(212)Remove Sp Cond Colon Before|(212)Force Sp Cond Colon Before"
-ValueDefault=ignore
-
-[Sp Cond Colon After]
-Category=1
-Description="<html>(213)Add or remove space after the ':' in 'b ? t : f'.<br/><br/>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
-ChoicesReadable="(213)Ignore Sp Cond Colon After|(213)Add Sp Cond Colon After|(213)Remove Sp Cond Colon After|(213)Force Sp Cond Colon After"
-ValueDefault=ignore
-
-[Sp Cond Question]
-Category=1
-Description="<html>(214)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
-ChoicesReadable="(214)Ignore Sp Cond Question|(214)Add Sp Cond Question|(214)Remove Sp Cond Question|(214)Force Sp Cond Question"
-ValueDefault=ignore
-
-[Sp Cond Question Before]
-Category=1
-Description="<html>(215)Add or remove space before the '?' in 'b ? t : f'.<br/><br/>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
-ChoicesReadable="(215)Ignore Sp Cond Question Before|(215)Add Sp Cond Question Before|(215)Remove Sp Cond Question Before|(215)Force Sp Cond Question Before"
-ValueDefault=ignore
-
-[Sp Cond Question After]
-Category=1
-Description="<html>(216)Add or remove space after the '?' in 'b ? t : f'.<br/><br/>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
-ChoicesReadable="(216)Ignore Sp Cond Question After|(216)Add Sp Cond Question After|(216)Remove Sp Cond Question After|(216)Force Sp Cond Question After"
-ValueDefault=ignore
-
-[Sp Cond Ternary Short]
-Category=1
-Description="<html>(217)In the abbreviated ternary form '(a ?: b)', add or remove space between '?'<br/>and ':'.<br/><br/>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
-ChoicesReadable="(217)Ignore Sp Cond Ternary Short|(217)Add Sp Cond Ternary Short|(217)Remove Sp Cond Ternary Short|(217)Force Sp Cond Ternary Short"
-ValueDefault=ignore
-
-[Sp Case Label]
-Category=1
-Description="<html>(218)Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make<br/>sense here.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_case_label=ignore|sp_case_label=add|sp_case_label=remove|sp_case_label=force
-ChoicesReadable="(218)Ignore Sp Case Label|(218)Add Sp Case Label|(218)Remove Sp Case Label|(218)Force Sp Case Label"
-ValueDefault=ignore
-
-[Sp Range]
-Category=1
-Description="<html>(219)(D) Add or remove space around the D '..' operator.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_range=ignore|sp_range=add|sp_range=remove|sp_range=force
-ChoicesReadable="(219)Ignore Sp Range|(219)Add Sp Range|(219)Remove Sp Range|(219)Force Sp Range"
-ValueDefault=ignore
-
-[Sp After For Colon]
-Category=1
-Description="<html>(220)Add or remove space after ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var : expr)'.</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
-ChoicesReadable="(220)Ignore Sp After For Colon|(220)Add Sp After For Colon|(220)Remove Sp After For Colon|(220)Force Sp After For Colon"
-ValueDefault=ignore
-
-[Sp Before For Colon]
-Category=1
-Description="<html>(221)Add or remove space before ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var : expr)'.</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
-ChoicesReadable="(221)Ignore Sp Before For Colon|(221)Add Sp Before For Colon|(221)Remove Sp Before For Colon|(221)Force Sp Before For Colon"
-ValueDefault=ignore
-
-[Sp Extern Paren]
-Category=1
-Description="<html>(222)(D) Add or remove space between 'extern' and '(' as in 'extern (C)'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_extern_paren=ignore|sp_extern_paren=add|sp_extern_paren=remove|sp_extern_paren=force
-ChoicesReadable="(222)Ignore Sp Extern Paren|(222)Add Sp Extern Paren|(222)Remove Sp Extern Paren|(222)Force Sp Extern Paren"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Start]
-Category=1
-Description="<html>(223)Add or remove space after the opening of a C++ comment,<br/>i.e. '// 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
-ChoicesReadable="(223)Ignore Sp Cmt Cpp Start|(223)Add Sp Cmt Cpp Start|(223)Remove Sp Cmt Cpp Start|(223)Force Sp Cmt Cpp Start"
-ValueDefault=ignore
-
-[Sp Cmt Cpp Doxygen]
-Category=1
-Description="<html>(224)If true, space is added with sp_cmt_cpp_start will be added after doxygen<br/>sequences like '///', '///&lt;', '//!' and '//!&lt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=sp_cmt_cpp_doxygen=true|sp_cmt_cpp_doxygen=false
-ValueDefault=false
-
-[Sp Cmt Cpp Qttr]
-Category=1
-Description="<html>(225)If true, space is added with sp_cmt_cpp_start will be added after Qt<br/>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
-
-[Sp Endif Cmt]
-Category=1
-Description="<html>(226)Add or remove space between #else or #endif and a trailing comment.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_endif_cmt=ignore|sp_endif_cmt=add|sp_endif_cmt=remove|sp_endif_cmt=force
-ChoicesReadable="(226)Ignore Sp Endif Cmt|(226)Add Sp Endif Cmt|(226)Remove Sp Endif Cmt|(226)Force Sp Endif Cmt"
-ValueDefault=ignore
-
-[Sp After New]
-Category=1
-Description="<html>(227)Add or remove space 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
-ChoicesReadable="(227)Ignore Sp After New|(227)Add Sp After New|(227)Remove Sp After New|(227)Force Sp After New"
-ValueDefault=ignore
-
-[Sp Between New Paren]
-Category=1
-Description="<html>(228)Add or remove space 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
-ChoicesReadable="(228)Ignore Sp Between New Paren|(228)Add Sp Between New Paren|(228)Remove Sp Between New Paren|(228)Force Sp Between New Paren"
-ValueDefault=ignore
-
-[Sp After Newop Paren]
-Category=1
-Description="<html>(229)Add or remove space 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
-ChoicesReadable="(229)Ignore Sp After Newop Paren|(229)Add Sp After Newop Paren|(229)Remove Sp After Newop Paren|(229)Force Sp After Newop Paren"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren]
-Category=1
-Description="<html>(230)Add or remove space inside parenthesis of the new operator<br/>as in '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
-ChoicesReadable="(230)Ignore Sp Inside Newop Paren|(230)Add Sp Inside Newop Paren|(230)Remove Sp Inside Newop Paren|(230)Force Sp Inside Newop Paren"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren Open]
-Category=1
-Description="<html>(231)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>"
-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
-ChoicesReadable="(231)Ignore Sp Inside Newop Paren Open|(231)Add Sp Inside Newop Paren Open|(231)Remove Sp Inside Newop Paren Open|(231)Force Sp Inside Newop Paren Open"
-ValueDefault=ignore
-
-[Sp Inside Newop Paren Close]
-Category=1
-Description="<html>(232)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>"
-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
-ChoicesReadable="(232)Ignore Sp Inside Newop Paren Close|(232)Add Sp Inside Newop Paren Close|(232)Remove Sp Inside Newop Paren Close|(232)Force Sp Inside Newop Paren Close"
-ValueDefault=ignore
-
-[Sp Before Tr Emb Cmt]
-Category=1
-Description="<html>(233)Add or remove space 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
-ChoicesReadable="(233)Ignore Sp Before Tr Emb Cmt|(233)Add Sp Before Tr Emb Cmt|(233)Remove Sp Before Tr Emb Cmt|(233)Force Sp Before Tr Emb Cmt"
-ValueDefault=ignore
-
-[Sp Num Before Tr Emb Cmt]
-Category=1
-Description="<html>(234)Number of spaces before a trailing or embedded comment.</html>"
-Enabled=false
-EditorType=numeric
-CallName="sp_num_before_tr_emb_cmt="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Sp Annotation Paren]
-Category=1
-Description="<html>(235)(Java) Add or remove space between an annotation and the open parenthesis.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_annotation_paren=ignore|sp_annotation_paren=add|sp_annotation_paren=remove|sp_annotation_paren=force
-ChoicesReadable="(235)Ignore Sp Annotation Paren|(235)Add Sp Annotation Paren|(235)Remove Sp Annotation Paren|(235)Force Sp Annotation Paren"
-ValueDefault=ignore
-
-[Sp Skip Vbrace Tokens]
-Category=1
-Description="<html>(236)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
-
-[Sp After Noexcept]
-Category=1
-Description="<html>(237)Add or remove 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
-ChoicesReadable="(237)Ignore Sp After Noexcept|(237)Add Sp After Noexcept|(237)Remove Sp After Noexcept|(237)Force Sp After Noexcept"
-ValueDefault=ignore
-
-[Sp Vala After Translation]
-Category=1
-Description="<html>(238)Add or remove space after '_'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_vala_after_translation=ignore|sp_vala_after_translation=add|sp_vala_after_translation=remove|sp_vala_after_translation=force
-ChoicesReadable="(238)Ignore Sp Vala After Translation|(238)Add Sp Vala After Translation|(238)Remove Sp Vala After Translation|(238)Force Sp Vala After Translation"
-ValueDefault=ignore
-
-[Force Tab After Define]
-Category=1
-Description="<html>(239)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
-
-[Indent Columns]
-Category=2
-Description="<html>(240)The number of columns to indent per level. Usually 2, 3, 4, or 8.<br/><br/>Default: 8</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_columns="
-MinVal=0
-MaxVal=16
-ValueDefault=8
-
-[Indent Continue]
-Category=2
-Description="<html>(241)The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_continue="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Continue Class Head]
-Category=2
-Description="<html>(242)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>(243)Whether to indent empty lines (i.e. lines which contain only spaces before<br/>the newline character).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_single_newlines=true|indent_single_newlines=false
-ValueDefault=false
-
-[Indent Param]
-Category=2
-Description="<html>(244)The continuation indent for func_*_param if they are true. If non-zero, this<br/>overrides the indent.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_param="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent With Tabs]
-Category=2
-Description="<html>(245)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>"
-Enabled=true
-EditorType=multiple
-Choices="indent_with_tabs=0|indent_with_tabs=1|indent_with_tabs=2"
-ChoicesReadable="(245)Spaces only|(245)Indent with tabs, align with spaces|(245)Indent and align with tabs"
-ValueDefault=1
-
-[Indent Cmt With Tabs]
-Category=2
-Description="<html>(246)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cmt_with_tabs=true|indent_cmt_with_tabs=false
-ValueDefault=false
-
-[Indent Align String]
-Category=2
-Description="<html>(247)Whether to indent strings broken by '\' so that they line up.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_string=true|indent_align_string=false
-ValueDefault=false
-
-[Indent Xml String]
-Category=2
-Description="<html>(248)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="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Brace]
-Category=2
-Description="<html>(249)Spaces to indent '{' from level.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_brace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Braces]
-Category=2
-Description="<html>(250)Whether braces are indented to the body level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces=true|indent_braces=false
-ValueDefault=false
-
-[Indent Braces No Func]
-Category=2
-Description="<html>(251)Whether to disable indenting function braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_func=true|indent_braces_no_func=false
-ValueDefault=false
-
-[Indent Braces No Class]
-Category=2
-Description="<html>(252)Whether to disable indenting class braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_class=true|indent_braces_no_class=false
-ValueDefault=false
-
-[Indent Braces No Struct]
-Category=2
-Description="<html>(253)Whether to disable indenting struct braces if indent_braces=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_braces_no_struct=true|indent_braces_no_struct=false
-ValueDefault=false
-
-[Indent Brace Parent]
-Category=2
-Description="<html>(254)Whether to indent based on the size of the brace parent,<br/>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
-
-[Indent Paren Open Brace]
-Category=2
-Description="<html>(255)Whether to indent based on the open parenthesis instead of the open brace<br/>in '({\n'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_open_brace=true|indent_paren_open_brace=false
-ValueDefault=false
-
-[Indent Cs Delegate Brace]
-Category=2
-Description="<html>(256)(C#) Whether to indent the brace of a C# delegate by another level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cs_delegate_brace=true|indent_cs_delegate_brace=false
-ValueDefault=false
-
-[Indent Cs Delegate Body]
-Category=2
-Description="<html>(257)(C#) Whether to indent a C# delegate (to handle delegates with no brace) by<br/>another level.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cs_delegate_body=true|indent_cs_delegate_body=false
-ValueDefault=false
-
-[Indent Namespace]
-Category=2
-Description="<html>(258)Whether to indent the body of a 'namespace'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_namespace=true|indent_namespace=false
-ValueDefault=false
-
-[Indent Namespace Single Indent]
-Category=2
-Description="<html>(259)Whether to indent only the first namespace, and not any nested namespaces.<br/>Requires indent_namespace=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_namespace_single_indent=true|indent_namespace_single_indent=false
-ValueDefault=false
-
-[Indent Namespace Level]
-Category=2
-Description="<html>(260)The number of spaces to indent a namespace block.<br/>If set to zero, use the value indent_columns</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_namespace_level="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Namespace Limit]
-Category=2
-Description="<html>(261)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>"
-Enabled=false
-EditorType=numeric
-CallName="indent_namespace_limit="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Indent Extern]
-Category=2
-Description="<html>(262)Whether the 'extern "C"' body is indented.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_extern=true|indent_extern=false
-ValueDefault=false
-
-[Indent Class]
-Category=2
-Description="<html>(263)Whether the 'class' body is indented.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class=true|indent_class=false
-ValueDefault=false
-
-[Indent Class Colon]
-Category=2
-Description="<html>(264)Whether to indent the stuff after a leading base class colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class_colon=true|indent_class_colon=false
-ValueDefault=false
-
-[Indent Class On Colon]
-Category=2
-Description="<html>(265)Whether to indent based on a class colon instead of the stuff after the<br/>colon. Requires indent_class_colon=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false
-ValueDefault=false
-
-[Indent Constr Colon]
-Category=2
-Description="<html>(266)Whether to indent the stuff after a leading class initializer colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_constr_colon=true|indent_constr_colon=false
-ValueDefault=false
-
-[Indent Ctor Init Leading]
-Category=2
-Description="<html>(267)Virtual indent from the ':' for member initializers.<br/><br/>Default: 2</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ctor_init_leading="
-MinVal=0
-MaxVal=16
-ValueDefault=2
-
-[Indent Ctor Init]
-Category=2
-Description="<html>(268)Additional indent for constructor initializer list.<br/>Negative values decrease indent down to the first column.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ctor_init="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Else If]
-Category=2
-Description="<html>(269)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_else_if=true|indent_else_if=false
-ValueDefault=false
-
-[Indent Var Def Blk]
-Category=2
-Description="<html>(270)Amount to indent variable declarations after a open brace.<br/><br/> &lt;0: Relative<br/>&gt;=0: Absolute</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_var_def_blk="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Var Def Cont]
-Category=2
-Description="<html>(271)Whether to 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
-
-[Indent Shift]
-Category=2
-Description="<html>(272)Whether to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;') instead of<br/>aligning. Set align_left_shift=false when enabling this.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_shift=true|indent_shift=false
-ValueDefault=false
-
-[Indent Func Def Force Col1]
-Category=2
-Description="<html>(273)Whether to force indentation of function definitions to start in column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_def_force_col1=true|indent_func_def_force_col1=false
-ValueDefault=false
-
-[Indent Func Call Param]
-Category=2
-Description="<html>(274)Whether to indent continued function call parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_call_param=true|indent_func_call_param=false
-ValueDefault=false
-
-[Indent Func Def Param]
-Category=2
-Description="<html>(275)Whether to indent continued function definition parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_def_param=true|indent_func_def_param=false
-ValueDefault=false
-
-[Indent Func Def Param Paren Pos Threshold]
-Category=2
-Description="<html>(276)for function definitions, only if indent_func_def_param is false<br/>Allows to align params when appropriate and indent them when not<br/>behave as if it was true if paren position is more than this value<br/>if paren position is more than the option value</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_def_param_paren_pos_threshold="
-MinVal=0
-MaxVal=160
-ValueDefault=0
-
-[Indent Func Proto Param]
-Category=2
-Description="<html>(277)Whether to indent continued function call prototype one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_proto_param=true|indent_func_proto_param=false
-ValueDefault=false
-
-[Indent Func Class Param]
-Category=2
-Description="<html>(278)Whether to indent continued function call declaration one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_class_param=true|indent_func_class_param=false
-ValueDefault=false
-
-[Indent Func Ctor Var Param]
-Category=2
-Description="<html>(279)Whether to indent continued class variable constructors one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_func_ctor_var_param=true|indent_func_ctor_var_param=false
-ValueDefault=false
-
-[Indent Template Param]
-Category=2
-Description="<html>(280)Whether to indent continued template parameter list one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_template_param=true|indent_template_param=false
-ValueDefault=false
-
-[Indent Func Param Double]
-Category=2
-Description="<html>(281)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
-
-[Indent Func Const]
-Category=2
-Description="<html>(282)Indentation column for standalone 'const' qualifier on a function<br/>prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_const="
-MinVal=0
-MaxVal=69
-ValueDefault=0
-
-[Indent Func Throw]
-Category=2
-Description="<html>(283)Indentation column for standalone 'throw' qualifier on a function<br/>prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_func_throw="
-MinVal=0
-MaxVal=41
-ValueDefault=0
-
-[Indent Macro Brace]
-Category=2
-Description="<html>(284)How to indent within a macro followed by a brace on the same line<br/>This allows reducing the indent in macros that have (for example)<br/>`do { ... } while (0)` blocks bracketing them.<br/><br/>true:  add an indent for the brace on the same line as the macro<br/>false: do not add an indent for the brace on the same line as the macro<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_macro_brace=true|indent_macro_brace=false
-ValueDefault=true
-
-[Indent Member]
-Category=2
-Description="<html>(285)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="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Member Single]
-Category=2
-Description="<html>(286)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_member_single=true|indent_member_single=false
-ValueDefault=false
-
-[Indent Sing Line Comments]
-Category=2
-Description="<html>(287)Spaces to indent single line ('//') comments on lines before code.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_sing_line_comments="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Sparen Extra]
-Category=2
-Description="<html>(288)When opening a paren for a control statement (if, for, while, etc), increase<br/>the indent level by this value. Negative values decrease the indent level.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_sparen_extra="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Relative Single Line Comments]
-Category=2
-Description="<html>(289)Whether to indent trailing single line ('//') comments relative to the code<br/>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
-
-[Indent Switch Case]
-Category=2
-Description="<html>(290)Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_switch_case="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Switch Break With Case]
-Category=2
-Description="<html>(291)indent 'break' with 'case' from 'switch'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_switch_break_with_case=true|indent_switch_break_with_case=false
-ValueDefault=false
-
-[Indent Switch Pp]
-Category=2
-Description="<html>(292)Whether to indent preprocessor statements inside of switch statements.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_switch_pp=true|indent_switch_pp=false
-ValueDefault=true
-
-[Indent Case Shift]
-Category=2
-Description="<html>(293)Spaces to shift the 'case' line, without affecting any other lines.<br/>Usually 0.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_case_shift="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Case Brace]
-Category=2
-Description="<html>(294)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>"
-Enabled=false
-EditorType=numeric
-CallName="indent_case_brace="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Indent Col1 Comment]
-Category=2
-Description="<html>(295)Whether to indent comments found in first column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_col1_comment=true|indent_col1_comment=false
-ValueDefault=false
-
-[Indent Col1 Multi String Literal]
-Category=2
-Description="<html>(296)Whether to indent multi string literal in first column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_col1_multi_string_literal=true|indent_col1_multi_string_literal=false
-ValueDefault=false
-
-[Indent Label]
-Category=2
-Description="<html>(297)How to indent goto labels.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_label="
-MinVal=-16
-MaxVal=16
-ValueDefault=1
-
-[Indent Access Spec]
-Category=2
-Description="<html>(298)How to indent access specifiers that are followed by a<br/>colon.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_access_spec="
-MinVal=-16
-MaxVal=16
-ValueDefault=1
-
-[Indent Access Spec Body]
-Category=2
-Description="<html>(299)Whether to indent the code after an access specifier by one level.<br/>If true, 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
-
-[Indent Paren Nl]
-Category=2
-Description="<html>(300)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_nl=true|indent_paren_nl=false
-ValueDefault=false
-
-[Indent Paren Close]
-Category=2
-Description="<html>(301)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>"
-Enabled=false
-EditorType=numeric
-CallName="indent_paren_close="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Indent Paren After Func Def]
-Category=2
-Description="<html>(302)Whether to indent the open parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_def=true|indent_paren_after_func_def=false
-ValueDefault=false
-
-[Indent Paren After Func Decl]
-Category=2
-Description="<html>(303)Whether to indent the open parenthesis of a function declaration,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_decl=true|indent_paren_after_func_decl=false
-ValueDefault=false
-
-[Indent Paren After Func Call]
-Category=2
-Description="<html>(304)Whether to indent the open parenthesis of a function call,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_paren_after_func_call=true|indent_paren_after_func_call=false
-ValueDefault=false
-
-[Indent Comma Paren]
-Category=2
-Description="<html>(305)Whether to indent a comma when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_comma_paren=true|indent_comma_paren=false
-ValueDefault=false
-
-[Indent Bool Paren]
-Category=2
-Description="<html>(306)Whether to indent a Boolean operator when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_bool_paren=true|indent_bool_paren=false
-ValueDefault=false
-
-[Indent Semicolon For Paren]
-Category=2
-Description="<html>(307)Whether to indent a semicolon when inside a for parenthesis.<br/>If true, aligns under the open for parenthesis.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_semicolon_for_paren=true|indent_semicolon_for_paren=false
-ValueDefault=false
-
-[Indent First Bool Expr]
-Category=2
-Description="<html>(308)Whether to align the first expression to following ones<br/>if indent_bool_paren=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
-ValueDefault=false
-
-[Indent First For Expr]
-Category=2
-Description="<html>(309)Whether to align the first expression to following ones<br/>if indent_semicolon_for_paren=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_first_for_expr=true|indent_first_for_expr=false
-ValueDefault=false
-
-[Indent Square Nl]
-Category=2
-Description="<html>(310)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_square_nl=true|indent_square_nl=false
-ValueDefault=false
-
-[Indent Preserve Sql]
-Category=2
-Description="<html>(311)(ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false
-ValueDefault=false
-
-[Indent Align Assign]
-Category=2
-Description="<html>(312)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_assign=true|indent_align_assign=false
-ValueDefault=true
-
-[Indent Off After Assign]
-Category=2
-Description="<html>(313)If true, the indentation of the chunks after a '=' sequence will be set at<br/>LHS token indentation column before '='.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_assign=true|indent_off_after_assign=false
-ValueDefault=false
-
-[Indent Align Paren]
-Category=2
-Description="<html>(314)Whether to align continued statements at the '('. If false or the '(' is<br/>followed by a newline, the next line indent is one tab.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_align_paren=true|indent_align_paren=false
-ValueDefault=true
-
-[Indent Oc Inside Msg Sel]
-Category=2
-Description="<html>(315)(OC) Whether to indent Objective-C code inside message selectors.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_inside_msg_sel=true|indent_oc_inside_msg_sel=false
-ValueDefault=false
-
-[Indent Oc Block]
-Category=2
-Description="<html>(316)(OC) Whether to indent Objective-C blocks at brace level instead of usual<br/>rules.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block=true|indent_oc_block=false
-ValueDefault=false
-
-[Indent Oc Block Msg]
-Category=2
-Description="<html>(317)(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>"
-Enabled=false
-EditorType=numeric
-CallName="indent_oc_block_msg="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Oc Msg Colon]
-Category=2
-Description="<html>(318)(OC) Minimum indent for subsequent parameters</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_oc_msg_colon="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Indent Oc Msg Prioritize First Colon]
-Category=2
-Description="<html>(319)(OC) Whether to prioritize aligning with initial colon (and stripping spaces<br/>from lines, if necessary).<br/><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
-
-[Indent Oc Block Msg Xcode Style]
-Category=2
-Description="<html>(320)(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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_xcode_style=true|indent_oc_block_msg_xcode_style=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Keyword]
-Category=2
-Description="<html>(321)(OC) Whether to indent blocks from where the brace is, relative to a<br/>message keyword. Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_keyword=true|indent_oc_block_msg_from_keyword=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Colon]
-Category=2
-Description="<html>(322)(OC) Whether to indent blocks from where the brace is, relative to a message<br/>colon. Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_colon=true|indent_oc_block_msg_from_colon=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Caret]
-Category=2
-Description="<html>(323)(OC) Whether to indent blocks from where the block caret is.<br/>Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_caret=true|indent_oc_block_msg_from_caret=false
-ValueDefault=false
-
-[Indent Oc Block Msg From Brace]
-Category=2
-Description="<html>(324)(OC) Whether to indent blocks from where the brace caret is.<br/>Requires indent_oc_block_msg=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_oc_block_msg_from_brace=true|indent_oc_block_msg_from_brace=false
-ValueDefault=false
-
-[Indent Min Vbrace Open]
-Category=2
-Description="<html>(325)When indenting after virtual brace open and newline add further spaces to<br/>reach this minimum indent.</html>"
-Enabled=false
-EditorType=numeric
-CallName="indent_min_vbrace_open="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Indent Vbrace Open On Tabstop]
-Category=2
-Description="<html>(326)Whether to add further spaces after regular indent to reach next tabstop<br/>when indenting after virtual brace open and newline.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_vbrace_open_on_tabstop=true|indent_vbrace_open_on_tabstop=false
-ValueDefault=false
-
-[Indent Token After Brace]
-Category=2
-Description="<html>(327)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_token_after_brace=true|indent_token_after_brace=false
-ValueDefault=true
-
-[Indent Cpp Lambda Body]
-Category=2
-Description="<html>(328)Whether to indent the body of a C++11 lambda.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cpp_lambda_body=true|indent_cpp_lambda_body=false
-ValueDefault=false
-
-[Indent Compound Literal Return]
-Category=2
-Description="<html>(329)How to indent compound literals that are being returned.<br/>true: add both the indent from return &amp; the compound literal open brace (ie:<br/>      2 indent levels)<br/>false: only indent 1 level, don't add the indent for the open brace, only add<br/>       the indent for the return.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_compound_literal_return=true|indent_compound_literal_return=false
-ValueDefault=true
-
-[Indent Using Block]
-Category=2
-Description="<html>(330)(C#) Whether to indent a 'using' block if no braces are used.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_using_block=true|indent_using_block=false
-ValueDefault=true
-
-[Indent Ternary Operator]
-Category=2
-Description="<html>(331)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>"
-Enabled=false
-EditorType=numeric
-CallName="indent_ternary_operator="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Indent Inside Ternary Operator]
-Category=2
-Description="<html>(332)Whether to indent the statments inside ternary operator.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_inside_ternary_operator=true|indent_inside_ternary_operator=false
-ValueDefault=false
-
-[Indent Off After Return]
-Category=2
-Description="<html>(333)If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_return=true|indent_off_after_return=false
-ValueDefault=false
-
-[Indent Off After Return New]
-Category=2
-Description="<html>(334)If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_off_after_return_new=true|indent_off_after_return_new=false
-ValueDefault=false
-
-[Indent Single After Return]
-Category=2
-Description="<html>(335)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
-
-[Indent Ignore Asm Block]
-Category=2
-Description="<html>(336)Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they<br/>have their own indentation).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_ignore_asm_block=true|indent_ignore_asm_block=false
-ValueDefault=false
-
-[Donot Indent Func Def Close Paren]
-Category=2
-Description="<html>(337)Don't indent the close parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=donot_indent_func_def_close_paren=true|donot_indent_func_def_close_paren=false
-ValueDefault=false
-
-[Nl Collapse Empty Body]
-Category=3
-Description="<html>(338)Whether to collapse empty blocks between '{' and '}'.<br/>If true, overrides nl_inside_empty_func</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false
-ValueDefault=false
-
-[Nl Assign Leave One Liners]
-Category=3
-Description="<html>(339)Don't split one-line braced assignments, as in '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
-
-[Nl Class Leave One Liners]
-Category=3
-Description="<html>(340)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
-
-[Nl Enum Leave One Liners]
-Category=3
-Description="<html>(341)Don't split one-line enums, as in 'enum foo { BAR = 15 };'</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_enum_leave_one_liners=true|nl_enum_leave_one_liners=false
-ValueDefault=false
-
-[Nl Getset Leave One Liners]
-Category=3
-Description="<html>(342)Don't split one-line get or set functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_getset_leave_one_liners=true|nl_getset_leave_one_liners=false
-ValueDefault=false
-
-[Nl Cs Property Leave One Liners]
-Category=3
-Description="<html>(343)(C#) Don't split one-line property 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
-
-[Nl Func Leave One Liners]
-Category=3
-Description="<html>(344)Don't split one-line function definitions, as in 'int foo() { return 0; }'.<br/>might modify nl_func_type_name</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_leave_one_liners=true|nl_func_leave_one_liners=false
-ValueDefault=false
-
-[Nl Cpp Lambda Leave One Liners]
-Category=3
-Description="<html>(345)Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_cpp_lambda_leave_one_liners=true|nl_cpp_lambda_leave_one_liners=false
-ValueDefault=false
-
-[Nl If Leave One Liners]
-Category=3
-Description="<html>(346)Don't split one-line if/else statements, as in 'if(...) b++;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_if_leave_one_liners=true|nl_if_leave_one_liners=false
-ValueDefault=false
-
-[Nl While Leave One Liners]
-Category=3
-Description="<html>(347)Don't split one-line while statements, as in 'while(...) 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>(348)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
-
-[Nl Oc Msg Leave One Liner]
-Category=3
-Description="<html>(349)(OC) Don't split one-line Objective-C 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>(350)(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="(350)Ignore Nl Oc Mdef Brace|(350)Add Nl Oc Mdef Brace|(350)Remove Nl Oc Mdef Brace|(350)Force Nl Oc Mdef Brace"
-ValueDefault=ignore
-
-[Nl Oc Block Brace]
-Category=3
-Description="<html>(351)(OC) 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
-ChoicesReadable="(351)Ignore Nl Oc Block Brace|(351)Add Nl Oc Block Brace|(351)Remove Nl Oc Block Brace|(351)Force Nl Oc Block Brace"
-ValueDefault=ignore
-
-[Nl Oc Before Interface]
-Category=3
-Description="<html>(352)(OC) Add or remove blank line before '@interface' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_interface=ignore|nl_oc_before_interface=add|nl_oc_before_interface=remove|nl_oc_before_interface=force
-ChoicesReadable="(352)Ignore Nl Oc Before Interface|(352)Add Nl Oc Before Interface|(352)Remove Nl Oc Before Interface|(352)Force Nl Oc Before Interface"
-ValueDefault=ignore
-
-[Nl Oc Before Implementation]
-Category=3
-Description="<html>(353)(OC) Add or remove blank line before '@implementation' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_implementation=ignore|nl_oc_before_implementation=add|nl_oc_before_implementation=remove|nl_oc_before_implementation=force
-ChoicesReadable="(353)Ignore Nl Oc Before Implementation|(353)Add Nl Oc Before Implementation|(353)Remove Nl Oc Before Implementation|(353)Force Nl Oc Before Implementation"
-ValueDefault=ignore
-
-[Nl Oc Before End]
-Category=3
-Description="<html>(354)(OC) Add or remove blank line before '@end' statement.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_oc_before_end=ignore|nl_oc_before_end=add|nl_oc_before_end=remove|nl_oc_before_end=force
-ChoicesReadable="(354)Ignore Nl Oc Before End|(354)Add Nl Oc Before End|(354)Remove Nl Oc Before End|(354)Force Nl Oc Before End"
-ValueDefault=ignore
-
-[Nl Oc Interface Brace]
-Category=3
-Description="<html>(355)(OC) 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
-ChoicesReadable="(355)Ignore Nl Oc Interface Brace|(355)Add Nl Oc Interface Brace|(355)Remove Nl Oc Interface Brace|(355)Force Nl Oc Interface Brace"
-ValueDefault=ignore
-
-[Nl Oc Implementation Brace]
-Category=3
-Description="<html>(356)(OC) 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
-ChoicesReadable="(356)Ignore Nl Oc Implementation Brace|(356)Add Nl Oc Implementation Brace|(356)Remove Nl Oc Implementation Brace|(356)Force Nl Oc Implementation Brace"
-ValueDefault=ignore
-
-[Nl Start Of File]
-Category=3
-Description="<html>(357)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
-ChoicesReadable="(357)Ignore Nl Start Of File|(357)Add Nl Start Of File|(357)Remove Nl Start Of File|(357)Force Nl Start Of File"
-ValueDefault=ignore
-
-[Nl Start Of File Min]
-Category=3
-Description="<html>(358)The minimum number of newlines at the start of the file (only used if<br/>nl_start_of_file is 'add' or 'force').</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_start_of_file_min="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl End Of File]
-Category=3
-Description="<html>(359)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
-ChoicesReadable="(359)Ignore Nl End Of File|(359)Add Nl End Of File|(359)Remove Nl End Of File|(359)Force Nl End Of File"
-ValueDefault=ignore
-
-[Nl End Of File Min]
-Category=3
-Description="<html>(360)The minimum number of newlines at the end of the file (only used if<br/>nl_end_of_file is 'add' or 'force').</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_end_of_file_min="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Assign Brace]
-Category=3
-Description="<html>(361)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
-ChoicesReadable="(361)Ignore Nl Assign Brace|(361)Add Nl Assign Brace|(361)Remove Nl Assign Brace|(361)Force Nl Assign Brace"
-ValueDefault=ignore
-
-[Nl Assign Square]
-Category=3
-Description="<html>(362)(D) Add or remove newline between '=' and '['.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force
-ChoicesReadable="(362)Ignore Nl Assign Square|(362)Add Nl Assign Square|(362)Remove Nl Assign Square|(362)Force Nl Assign Square"
-ValueDefault=ignore
-
-[Nl Tsquare Brace]
-Category=3
-Description="<html>(363)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
-ChoicesReadable="(363)Ignore Nl Tsquare Brace|(363)Add Nl Tsquare Brace|(363)Remove Nl Tsquare Brace|(363)Force Nl Tsquare Brace"
-ValueDefault=ignore
-
-[Nl After Square Assign]
-Category=3
-Description="<html>(364)(D) Add or remove newline after '= ['. Will also affect the newline before<br/>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
-ChoicesReadable="(364)Ignore Nl After Square Assign|(364)Add Nl After Square Assign|(364)Remove Nl After Square Assign|(364)Force Nl After Square Assign"
-ValueDefault=ignore
-
-[Nl Fcall Brace]
-Category=3
-Description="<html>(365)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
-ChoicesReadable="(365)Ignore Nl Fcall Brace|(365)Add Nl Fcall Brace|(365)Remove Nl Fcall Brace|(365)Force Nl Fcall Brace"
-ValueDefault=ignore
-
-[Nl Enum Brace]
-Category=3
-Description="<html>(366)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
-ChoicesReadable="(366)Ignore Nl Enum Brace|(366)Add Nl Enum Brace|(366)Remove Nl Enum Brace|(366)Force Nl Enum Brace"
-ValueDefault=ignore
-
-[Nl Enum Class]
-Category=3
-Description="<html>(367)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
-ChoicesReadable="(367)Ignore Nl Enum Class|(367)Add Nl Enum Class|(367)Remove Nl Enum Class|(367)Force Nl Enum Class"
-ValueDefault=ignore
-
-[Nl Enum Class Identifier]
-Category=3
-Description="<html>(368)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
-ChoicesReadable="(368)Ignore Nl Enum Class Identifier|(368)Add Nl Enum Class Identifier|(368)Remove Nl Enum Class Identifier|(368)Force Nl Enum Class Identifier"
-ValueDefault=ignore
-
-[Nl Enum Identifier Colon]
-Category=3
-Description="<html>(369)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
-ChoicesReadable="(369)Ignore Nl Enum Identifier Colon|(369)Add Nl Enum Identifier Colon|(369)Remove Nl Enum Identifier Colon|(369)Force Nl Enum Identifier Colon"
-ValueDefault=ignore
-
-[Nl Enum Colon Type]
-Category=3
-Description="<html>(370)Add or remove newline between 'enum class identifier :' and 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
-ChoicesReadable="(370)Ignore Nl Enum Colon Type|(370)Add Nl Enum Colon Type|(370)Remove Nl Enum Colon Type|(370)Force Nl Enum Colon Type"
-ValueDefault=ignore
-
-[Nl Struct Brace]
-Category=3
-Description="<html>(371)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
-ChoicesReadable="(371)Ignore Nl Struct Brace|(371)Add Nl Struct Brace|(371)Remove Nl Struct Brace|(371)Force Nl Struct Brace"
-ValueDefault=ignore
-
-[Nl Union Brace]
-Category=3
-Description="<html>(372)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
-ChoicesReadable="(372)Ignore Nl Union Brace|(372)Add Nl Union Brace|(372)Remove Nl Union Brace|(372)Force Nl Union Brace"
-ValueDefault=ignore
-
-[Nl If Brace]
-Category=3
-Description="<html>(373)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
-ChoicesReadable="(373)Ignore Nl If Brace|(373)Add Nl If Brace|(373)Remove Nl If Brace|(373)Force Nl If Brace"
-ValueDefault=ignore
-
-[Nl Brace Else]
-Category=3
-Description="<html>(374)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
-ChoicesReadable="(374)Ignore Nl Brace Else|(374)Add Nl Brace Else|(374)Remove Nl Brace Else|(374)Force Nl Brace Else"
-ValueDefault=ignore
-
-[Nl Elseif Brace]
-Category=3
-Description="<html>(375)Add or remove newline between 'else if' and '{'. If set to ignore,<br/>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
-ChoicesReadable="(375)Ignore Nl Elseif Brace|(375)Add Nl Elseif Brace|(375)Remove Nl Elseif Brace|(375)Force Nl Elseif Brace"
-ValueDefault=ignore
-
-[Nl Else Brace]
-Category=3
-Description="<html>(376)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
-ChoicesReadable="(376)Ignore Nl Else Brace|(376)Add Nl Else Brace|(376)Remove Nl Else Brace|(376)Force Nl Else Brace"
-ValueDefault=ignore
-
-[Nl Else If]
-Category=3
-Description="<html>(377)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
-ChoicesReadable="(377)Ignore Nl Else If|(377)Add Nl Else If|(377)Remove Nl Else If|(377)Force Nl Else If"
-ValueDefault=ignore
-
-[Nl Before Opening Brace Func Class Def]
-Category=3
-Description="<html>(378)Add or remove newline before '{' opening brace</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_opening_brace_func_class_def=ignore|nl_before_opening_brace_func_class_def=add|nl_before_opening_brace_func_class_def=remove|nl_before_opening_brace_func_class_def=force
-ChoicesReadable="(378)Ignore Nl Before Opening Brace Func Class Def|(378)Add Nl Before Opening Brace Func Class Def|(378)Remove Nl Before Opening Brace Func Class Def|(378)Force Nl Before Opening Brace Func Class Def"
-ValueDefault=ignore
-
-[Nl Before If Closing Paren]
-Category=3
-Description="<html>(379)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
-ChoicesReadable="(379)Ignore Nl Before If Closing Paren|(379)Add Nl Before If Closing Paren|(379)Remove Nl Before If Closing Paren|(379)Force Nl Before If Closing Paren"
-ValueDefault=ignore
-
-[Nl Brace Finally]
-Category=3
-Description="<html>(380)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
-ChoicesReadable="(380)Ignore Nl Brace Finally|(380)Add Nl Brace Finally|(380)Remove Nl Brace Finally|(380)Force Nl Brace Finally"
-ValueDefault=ignore
-
-[Nl Finally Brace]
-Category=3
-Description="<html>(381)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
-ChoicesReadable="(381)Ignore Nl Finally Brace|(381)Add Nl Finally Brace|(381)Remove Nl Finally Brace|(381)Force Nl Finally Brace"
-ValueDefault=ignore
-
-[Nl Try Brace]
-Category=3
-Description="<html>(382)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
-ChoicesReadable="(382)Ignore Nl Try Brace|(382)Add Nl Try Brace|(382)Remove Nl Try Brace|(382)Force Nl Try Brace"
-ValueDefault=ignore
-
-[Nl Getset Brace]
-Category=3
-Description="<html>(383)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
-ChoicesReadable="(383)Ignore Nl Getset Brace|(383)Add Nl Getset Brace|(383)Remove Nl Getset Brace|(383)Force Nl Getset Brace"
-ValueDefault=ignore
-
-[Nl For Brace]
-Category=3
-Description="<html>(384)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
-ChoicesReadable="(384)Ignore Nl For Brace|(384)Add Nl For Brace|(384)Remove Nl For Brace|(384)Force Nl For Brace"
-ValueDefault=ignore
-
-[Nl Catch Brace]
-Category=3
-Description="<html>(385)Add or remove newline before the '{' of a 'catch' statement, as in<br/>'catch (decl) &lt;here&gt; {'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force
-ChoicesReadable="(385)Ignore Nl Catch Brace|(385)Add Nl Catch Brace|(385)Remove Nl Catch Brace|(385)Force Nl Catch Brace"
-ValueDefault=ignore
-
-[Nl Oc Catch Brace]
-Category=3
-Description="<html>(386)(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>"
-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
-ChoicesReadable="(386)Ignore Nl Oc Catch Brace|(386)Add Nl Oc Catch Brace|(386)Remove Nl Oc Catch Brace|(386)Force Nl Oc Catch Brace"
-ValueDefault=ignore
-
-[Nl Brace Catch]
-Category=3
-Description="<html>(387)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
-ChoicesReadable="(387)Ignore Nl Brace Catch|(387)Add Nl Brace Catch|(387)Remove Nl Brace Catch|(387)Force Nl Brace Catch"
-ValueDefault=ignore
-
-[Nl Oc Brace Catch]
-Category=3
-Description="<html>(388)(OC) Add or remove newline between '}' and '@catch'. If set to ignore,<br/>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
-ChoicesReadable="(388)Ignore Nl Oc Brace Catch|(388)Add Nl Oc Brace Catch|(388)Remove Nl Oc Brace Catch|(388)Force Nl Oc Brace Catch"
-ValueDefault=ignore
-
-[Nl Brace Square]
-Category=3
-Description="<html>(389)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
-ChoicesReadable="(389)Ignore Nl Brace Square|(389)Add Nl Brace Square|(389)Remove Nl Brace Square|(389)Force Nl Brace Square"
-ValueDefault=ignore
-
-[Nl Brace Fparen]
-Category=3
-Description="<html>(390)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
-ChoicesReadable="(390)Ignore Nl Brace Fparen|(390)Add Nl Brace Fparen|(390)Remove Nl Brace Fparen|(390)Force Nl Brace Fparen"
-ValueDefault=ignore
-
-[Nl While Brace]
-Category=3
-Description="<html>(391)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
-ChoicesReadable="(391)Ignore Nl While Brace|(391)Add Nl While Brace|(391)Remove Nl While Brace|(391)Force Nl While Brace"
-ValueDefault=ignore
-
-[Nl Scope Brace]
-Category=3
-Description="<html>(392)(D) Add or remove newline between 'scope (x)' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_scope_brace=ignore|nl_scope_brace=add|nl_scope_brace=remove|nl_scope_brace=force
-ChoicesReadable="(392)Ignore Nl Scope Brace|(392)Add Nl Scope Brace|(392)Remove Nl Scope Brace|(392)Force Nl Scope Brace"
-ValueDefault=ignore
-
-[Nl Unittest Brace]
-Category=3
-Description="<html>(393)(D) Add or remove newline between 'unittest' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_unittest_brace=ignore|nl_unittest_brace=add|nl_unittest_brace=remove|nl_unittest_brace=force
-ChoicesReadable="(393)Ignore Nl Unittest Brace|(393)Add Nl Unittest Brace|(393)Remove Nl Unittest Brace|(393)Force Nl Unittest Brace"
-ValueDefault=ignore
-
-[Nl Version Brace]
-Category=3
-Description="<html>(394)(D) Add or remove newline between 'version (x)' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_version_brace=ignore|nl_version_brace=add|nl_version_brace=remove|nl_version_brace=force
-ChoicesReadable="(394)Ignore Nl Version Brace|(394)Add Nl Version Brace|(394)Remove Nl Version Brace|(394)Force Nl Version Brace"
-ValueDefault=ignore
-
-[Nl Using Brace]
-Category=3
-Description="<html>(395)(C#) Add or remove newline between 'using' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_using_brace=ignore|nl_using_brace=add|nl_using_brace=remove|nl_using_brace=force
-ChoicesReadable="(395)Ignore Nl Using Brace|(395)Add Nl Using Brace|(395)Remove Nl Using Brace|(395)Force Nl Using Brace"
-ValueDefault=ignore
-
-[Nl Brace Brace]
-Category=3
-Description="<html>(396)Add or remove newline between two open or close braces. Due to general<br/>newline/brace handling, REMOVE may not work.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_brace_brace=ignore|nl_brace_brace=add|nl_brace_brace=remove|nl_brace_brace=force
-ChoicesReadable="(396)Ignore Nl Brace Brace|(396)Add Nl Brace Brace|(396)Remove Nl Brace Brace|(396)Force Nl Brace Brace"
-ValueDefault=ignore
-
-[Nl Do Brace]
-Category=3
-Description="<html>(397)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
-ChoicesReadable="(397)Ignore Nl Do Brace|(397)Add Nl Do Brace|(397)Remove Nl Do Brace|(397)Force Nl Do Brace"
-ValueDefault=ignore
-
-[Nl Brace While]
-Category=3
-Description="<html>(398)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
-ChoicesReadable="(398)Ignore Nl Brace While|(398)Add Nl Brace While|(398)Remove Nl Brace While|(398)Force Nl Brace While"
-ValueDefault=ignore
-
-[Nl Switch Brace]
-Category=3
-Description="<html>(399)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
-ChoicesReadable="(399)Ignore Nl Switch Brace|(399)Add Nl Switch Brace|(399)Remove Nl Switch Brace|(399)Force Nl Switch Brace"
-ValueDefault=ignore
-
-[Nl Synchronized Brace]
-Category=3
-Description="<html>(400)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
-ChoicesReadable="(400)Ignore Nl Synchronized Brace|(400)Add Nl Synchronized Brace|(400)Remove Nl Synchronized Brace|(400)Force Nl Synchronized Brace"
-ValueDefault=ignore
-
-[Nl Multi Line Cond]
-Category=3
-Description="<html>(401)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_multi_line_cond=true|nl_multi_line_cond=false
-ValueDefault=false
-
-[Nl Multi Line Sparen Open]
-Category=3
-Description="<html>(402)Add a newline after '(' if an if/for/while/switch condition spans multiple<br/>lines</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_multi_line_sparen_open=ignore|nl_multi_line_sparen_open=add|nl_multi_line_sparen_open=remove|nl_multi_line_sparen_open=force
-ChoicesReadable="(402)Ignore Nl Multi Line Sparen Open|(402)Add Nl Multi Line Sparen Open|(402)Remove Nl Multi Line Sparen Open|(402)Force Nl Multi Line Sparen Open"
-ValueDefault=ignore
-
-[Nl Multi Line Sparen Close]
-Category=3
-Description="<html>(403)Add a newline before ')' if an if/for/while/switch condition spans multiple<br/>lines. Overrides nl_before_if_closing_paren if both are specified.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_multi_line_sparen_close=ignore|nl_multi_line_sparen_close=add|nl_multi_line_sparen_close=remove|nl_multi_line_sparen_close=force
-ChoicesReadable="(403)Ignore Nl Multi Line Sparen Close|(403)Add Nl Multi Line Sparen Close|(403)Remove Nl Multi Line Sparen Close|(403)Force Nl Multi Line Sparen Close"
-ValueDefault=ignore
-
-[Nl Multi Line Define]
-Category=3
-Description="<html>(404)Force a newline in a define after the macro name for multi-line defines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_multi_line_define=true|nl_multi_line_define=false
-ValueDefault=false
-
-[Nl Before Case]
-Category=3
-Description="<html>(405)Whether to add a newline before 'case', and a blank line before a 'case'<br/>statement that follows a ';' or '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_case=true|nl_before_case=false
-ValueDefault=false
-
-[Nl After Case]
-Category=3
-Description="<html>(406)Whether to add a newline after a 'case' statement.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_case=true|nl_after_case=false
-ValueDefault=false
-
-[Nl Case Colon Brace]
-Category=3
-Description="<html>(407)Add or remove newline between a case ':' and '{'.<br/><br/>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
-ChoicesReadable="(407)Ignore Nl Case Colon Brace|(407)Add Nl Case Colon Brace|(407)Remove Nl Case Colon Brace|(407)Force Nl Case Colon Brace"
-ValueDefault=ignore
-
-[Nl Before Throw]
-Category=3
-Description="<html>(408)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="(408)Ignore Nl Before Throw|(408)Add Nl Before Throw|(408)Remove Nl Before Throw|(408)Force Nl Before Throw"
-ValueDefault=ignore
-
-[Nl Namespace Brace]
-Category=3
-Description="<html>(409)Add or remove 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
-ChoicesReadable="(409)Ignore Nl Namespace Brace|(409)Add Nl Namespace Brace|(409)Remove Nl Namespace Brace|(409)Force Nl Namespace Brace"
-ValueDefault=ignore
-
-[Nl Template Class]
-Category=3
-Description="<html>(410)Add or remove newline after 'template&lt;...&gt;' of a template class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class=ignore|nl_template_class=add|nl_template_class=remove|nl_template_class=force
-ChoicesReadable="(410)Ignore Nl Template Class|(410)Add Nl Template Class|(410)Remove Nl Template Class|(410)Force Nl Template Class"
-ValueDefault=ignore
-
-[Nl Template Class Decl]
-Category=3
-Description="<html>(411)Add or remove newline after 'template&lt;...&gt;' of a template class declaration.<br/><br/>Overrides nl_template_class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_decl=ignore|nl_template_class_decl=add|nl_template_class_decl=remove|nl_template_class_decl=force
-ChoicesReadable="(411)Ignore Nl Template Class Decl|(411)Add Nl Template Class Decl|(411)Remove Nl Template Class Decl|(411)Force Nl Template Class Decl"
-ValueDefault=ignore
-
-[Nl Template Class Decl Special]
-Category=3
-Description="<html>(412)Add or remove newline after 'template&lt;&gt;' of a specialized class declaration.<br/><br/>Overrides nl_template_class_decl.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_decl_special=ignore|nl_template_class_decl_special=add|nl_template_class_decl_special=remove|nl_template_class_decl_special=force
-ChoicesReadable="(412)Ignore Nl Template Class Decl Special|(412)Add Nl Template Class Decl Special|(412)Remove Nl Template Class Decl Special|(412)Force Nl Template Class Decl Special"
-ValueDefault=ignore
-
-[Nl Template Class Def]
-Category=3
-Description="<html>(413)Add or remove newline after 'template&lt;...&gt;' of a template class definition.<br/><br/>Overrides nl_template_class.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_def=ignore|nl_template_class_def=add|nl_template_class_def=remove|nl_template_class_def=force
-ChoicesReadable="(413)Ignore Nl Template Class Def|(413)Add Nl Template Class Def|(413)Remove Nl Template Class Def|(413)Force Nl Template Class Def"
-ValueDefault=ignore
-
-[Nl Template Class Def Special]
-Category=3
-Description="<html>(414)Add or remove newline after 'template&lt;&gt;' of a specialized class definition.<br/><br/>Overrides nl_template_class_def.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_class_def_special=ignore|nl_template_class_def_special=add|nl_template_class_def_special=remove|nl_template_class_def_special=force
-ChoicesReadable="(414)Ignore Nl Template Class Def Special|(414)Add Nl Template Class Def Special|(414)Remove Nl Template Class Def Special|(414)Force Nl Template Class Def Special"
-ValueDefault=ignore
-
-[Nl Template Func]
-Category=3
-Description="<html>(415)Add or remove newline after 'template&lt;...&gt;' of a template function.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func=ignore|nl_template_func=add|nl_template_func=remove|nl_template_func=force
-ChoicesReadable="(415)Ignore Nl Template Func|(415)Add Nl Template Func|(415)Remove Nl Template Func|(415)Force Nl Template Func"
-ValueDefault=ignore
-
-[Nl Template Func Decl]
-Category=3
-Description="<html>(416)Add or remove newline after 'template&lt;...&gt;' of a template function<br/>declaration.<br/><br/>Overrides nl_template_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_decl=ignore|nl_template_func_decl=add|nl_template_func_decl=remove|nl_template_func_decl=force
-ChoicesReadable="(416)Ignore Nl Template Func Decl|(416)Add Nl Template Func Decl|(416)Remove Nl Template Func Decl|(416)Force Nl Template Func Decl"
-ValueDefault=ignore
-
-[Nl Template Func Decl Special]
-Category=3
-Description="<html>(417)Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>declaration.<br/><br/>Overrides nl_template_func_decl.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_decl_special=ignore|nl_template_func_decl_special=add|nl_template_func_decl_special=remove|nl_template_func_decl_special=force
-ChoicesReadable="(417)Ignore Nl Template Func Decl Special|(417)Add Nl Template Func Decl Special|(417)Remove Nl Template Func Decl Special|(417)Force Nl Template Func Decl Special"
-ValueDefault=ignore
-
-[Nl Template Func Def]
-Category=3
-Description="<html>(418)Add or remove newline after 'template&lt;...&gt;' of a template function<br/>definition.<br/><br/>Overrides nl_template_func.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_def=ignore|nl_template_func_def=add|nl_template_func_def=remove|nl_template_func_def=force
-ChoicesReadable="(418)Ignore Nl Template Func Def|(418)Add Nl Template Func Def|(418)Remove Nl Template Func Def|(418)Force Nl Template Func Def"
-ValueDefault=ignore
-
-[Nl Template Func Def Special]
-Category=3
-Description="<html>(419)Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>definition.<br/><br/>Overrides nl_template_func_def.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_func_def_special=ignore|nl_template_func_def_special=add|nl_template_func_def_special=remove|nl_template_func_def_special=force
-ChoicesReadable="(419)Ignore Nl Template Func Def Special|(419)Add Nl Template Func Def Special|(419)Remove Nl Template Func Def Special|(419)Force Nl Template Func Def Special"
-ValueDefault=ignore
-
-[Nl Template Var]
-Category=3
-Description="<html>(420)Add or remove newline after 'template&lt;...&gt;' of a template variable.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_var=ignore|nl_template_var=add|nl_template_var=remove|nl_template_var=force
-ChoicesReadable="(420)Ignore Nl Template Var|(420)Add Nl Template Var|(420)Remove Nl Template Var|(420)Force Nl Template Var"
-ValueDefault=ignore
-
-[Nl Template Using]
-Category=3
-Description="<html>(421)Add or remove newline between 'template&lt;...&gt;' and 'using' of a templated<br/>type alias.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_template_using=ignore|nl_template_using=add|nl_template_using=remove|nl_template_using=force
-ChoicesReadable="(421)Ignore Nl Template Using|(421)Add Nl Template Using|(421)Remove Nl Template Using|(421)Force Nl Template Using"
-ValueDefault=ignore
-
-[Nl Class Brace]
-Category=3
-Description="<html>(422)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
-ChoicesReadable="(422)Ignore Nl Class Brace|(422)Add Nl Class Brace|(422)Remove Nl Class Brace|(422)Force Nl Class Brace"
-ValueDefault=ignore
-
-[Nl Class Init Args]
-Category=3
-Description="<html>(423)Add or remove newline before or after (depending on pos_class_comma,<br/>may not be IGNORE) each',' in the base class list.</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
-ChoicesReadable="(423)Ignore Nl Class Init Args|(423)Add Nl Class Init Args|(423)Remove Nl Class Init Args|(423)Force Nl Class Init Args"
-ValueDefault=ignore
-
-[Nl Constr Init Args]
-Category=3
-Description="<html>(424)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>"
-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
-ChoicesReadable="(424)Ignore Nl Constr Init Args|(424)Add Nl Constr Init Args|(424)Remove Nl Constr Init Args|(424)Force Nl Constr Init Args"
-ValueDefault=ignore
-
-[Nl Enum Own Lines]
-Category=3
-Description="<html>(425)Add or remove newline before first element, after comma, and after last<br/>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
-ChoicesReadable="(425)Ignore Nl Enum Own Lines|(425)Add Nl Enum Own Lines|(425)Remove Nl Enum Own Lines|(425)Force Nl Enum Own Lines"
-ValueDefault=ignore
-
-[Nl Func Type Name]
-Category=3
-Description="<html>(426)Add or remove newline between return type and function name in a function<br/>definition.<br/>might be modified by nl_func_leave_one_liners</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_type_name=ignore|nl_func_type_name=add|nl_func_type_name=remove|nl_func_type_name=force
-ChoicesReadable="(426)Ignore Nl Func Type Name|(426)Add Nl Func Type Name|(426)Remove Nl Func Type Name|(426)Force Nl Func Type Name"
-ValueDefault=ignore
-
-[Nl Func Type Name Class]
-Category=3
-Description="<html>(427)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>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_type_name_class=ignore|nl_func_type_name_class=add|nl_func_type_name_class=remove|nl_func_type_name_class=force
-ChoicesReadable="(427)Ignore Nl Func Type Name Class|(427)Add Nl Func Type Name Class|(427)Remove Nl Func Type Name Class|(427)Force Nl Func Type Name Class"
-ValueDefault=ignore
-
-[Nl Func Class Scope]
-Category=3
-Description="<html>(428)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>"
-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
-ChoicesReadable="(428)Ignore Nl Func Class Scope|(428)Add Nl Func Class Scope|(428)Remove Nl Func Class Scope|(428)Force Nl Func Class Scope"
-ValueDefault=ignore
-
-[Nl Func Scope Name]
-Category=3
-Description="<html>(429)Add or remove newline between function scope and name, as in<br/>'void A :: &lt;here&gt; 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
-ChoicesReadable="(429)Ignore Nl Func Scope Name|(429)Add Nl Func Scope Name|(429)Remove Nl Func Scope Name|(429)Force Nl Func Scope Name"
-ValueDefault=ignore
-
-[Nl Func Proto Type Name]
-Category=3
-Description="<html>(430)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
-ChoicesReadable="(430)Ignore Nl Func Proto Type Name|(430)Add Nl Func Proto Type Name|(430)Remove Nl Func Proto Type Name|(430)Force Nl Func Proto Type Name"
-ValueDefault=ignore
-
-[Nl Func Paren]
-Category=3
-Description="<html>(431)Add or remove newline between a function name and the opening '(' in the<br/>declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force
-ChoicesReadable="(431)Ignore Nl Func Paren|(431)Add Nl Func Paren|(431)Remove Nl Func Paren|(431)Force Nl Func Paren"
-ValueDefault=ignore
-
-[Nl Func Paren Empty]
-Category=3
-Description="<html>(432)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
-ChoicesReadable="(432)Ignore Nl Func Paren Empty|(432)Add Nl Func Paren Empty|(432)Remove Nl Func Paren Empty|(432)Force Nl Func Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Def Paren]
-Category=3
-Description="<html>(433)Add or remove newline between a function name and the opening '(' in the<br/>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
-ChoicesReadable="(433)Ignore Nl Func Def Paren|(433)Add Nl Func Def Paren|(433)Remove Nl Func Def Paren|(433)Force Nl Func Def Paren"
-ValueDefault=ignore
-
-[Nl Func Def Paren Empty]
-Category=3
-Description="<html>(434)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
-ChoicesReadable="(434)Ignore Nl Func Def Paren Empty|(434)Add Nl Func Def Paren Empty|(434)Remove Nl Func Def Paren Empty|(434)Force Nl Func Def Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Call Paren]
-Category=3
-Description="<html>(435)Add or remove newline between a function name and the opening '(' in the<br/>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
-ChoicesReadable="(435)Ignore Nl Func Call Paren|(435)Add Nl Func Call Paren|(435)Remove Nl Func Call Paren|(435)Force Nl Func Call Paren"
-ValueDefault=ignore
-
-[Nl Func Call Paren Empty]
-Category=3
-Description="<html>(436)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
-ChoicesReadable="(436)Ignore Nl Func Call Paren Empty|(436)Add Nl Func Call Paren Empty|(436)Remove Nl Func Call Paren Empty|(436)Force Nl Func Call Paren Empty"
-ValueDefault=ignore
-
-[Nl Func Decl Start]
-Category=3
-Description="<html>(437)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
-ChoicesReadable="(437)Ignore Nl Func Decl Start|(437)Add Nl Func Decl Start|(437)Remove Nl Func Decl Start|(437)Force Nl Func Decl Start"
-ValueDefault=ignore
-
-[Nl Func Def Start]
-Category=3
-Description="<html>(438)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
-ChoicesReadable="(438)Ignore Nl Func Def Start|(438)Add Nl Func Def Start|(438)Remove Nl Func Def Start|(438)Force Nl Func Def Start"
-ValueDefault=ignore
-
-[Nl Func Decl Start Single]
-Category=3
-Description="<html>(439)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
-ChoicesReadable="(439)Ignore Nl Func Decl Start Single|(439)Add Nl Func Decl Start Single|(439)Remove Nl Func Decl Start Single|(439)Force Nl Func Decl Start Single"
-ValueDefault=ignore
-
-[Nl Func Def Start Single]
-Category=3
-Description="<html>(440)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
-ChoicesReadable="(440)Ignore Nl Func Def Start Single|(440)Add Nl Func Def Start Single|(440)Remove Nl Func Def Start Single|(440)Force Nl Func Def Start Single"
-ValueDefault=ignore
-
-[Nl Func Decl Start Multi Line]
-Category=3
-Description="<html>(441)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_start_multi_line=true|nl_func_decl_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Def Start Multi Line]
-Category=3
-Description="<html>(442)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_start_multi_line=true|nl_func_def_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl Args]
-Category=3
-Description="<html>(443)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
-ChoicesReadable="(443)Ignore Nl Func Decl Args|(443)Add Nl Func Decl Args|(443)Remove Nl Func Decl Args|(443)Force Nl Func Decl Args"
-ValueDefault=ignore
-
-[Nl Func Def Args]
-Category=3
-Description="<html>(444)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
-ChoicesReadable="(444)Ignore Nl Func Def Args|(444)Add Nl Func Def Args|(444)Remove Nl Func Def Args|(444)Force Nl Func Def Args"
-ValueDefault=ignore
-
-[Nl Func Call Args]
-Category=3
-Description="<html>(445)Add or remove newline after each ',' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_args=ignore|nl_func_call_args=add|nl_func_call_args=remove|nl_func_call_args=force
-ChoicesReadable="(445)Ignore Nl Func Call Args|(445)Add Nl Func Call Args|(445)Remove Nl Func Call Args|(445)Force Nl Func Call Args"
-ValueDefault=ignore
-
-[Nl Func Decl Args Multi Line]
-Category=3
-Description="<html>(446)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_args_multi_line=true|nl_func_decl_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Def Args Multi Line]
-Category=3
-Description="<html>(447)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_args_multi_line=true|nl_func_def_args_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl End]
-Category=3
-Description="<html>(448)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
-ChoicesReadable="(448)Ignore Nl Func Decl End|(448)Add Nl Func Decl End|(448)Remove Nl Func Decl End|(448)Force Nl Func Decl End"
-ValueDefault=ignore
-
-[Nl Func Def End]
-Category=3
-Description="<html>(449)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
-ChoicesReadable="(449)Ignore Nl Func Def End|(449)Add Nl Func Def End|(449)Remove Nl Func Def End|(449)Force Nl Func Def End"
-ValueDefault=ignore
-
-[Nl Func Decl End Single]
-Category=3
-Description="<html>(450)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
-ChoicesReadable="(450)Ignore Nl Func Decl End Single|(450)Add Nl Func Decl End Single|(450)Remove Nl Func Decl End Single|(450)Force Nl Func Decl End Single"
-ValueDefault=ignore
-
-[Nl Func Def End Single]
-Category=3
-Description="<html>(451)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
-ChoicesReadable="(451)Ignore Nl Func Def End Single|(451)Add Nl Func Def End Single|(451)Remove Nl Func Def End Single|(451)Force Nl Func Def End Single"
-ValueDefault=ignore
-
-[Nl Func Decl End Multi Line]
-Category=3
-Description="<html>(452)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_decl_end_multi_line=true|nl_func_decl_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Def End Multi Line]
-Category=3
-Description="<html>(453)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_def_end_multi_line=true|nl_func_def_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Decl Empty]
-Category=3
-Description="<html>(454)Add or remove newline between '()' in a function declaration.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_decl_empty=ignore|nl_func_decl_empty=add|nl_func_decl_empty=remove|nl_func_decl_empty=force
-ChoicesReadable="(454)Ignore Nl Func Decl Empty|(454)Add Nl Func Decl Empty|(454)Remove Nl Func Decl Empty|(454)Force Nl Func Decl Empty"
-ValueDefault=ignore
-
-[Nl Func Def Empty]
-Category=3
-Description="<html>(455)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
-ChoicesReadable="(455)Ignore Nl Func Def Empty|(455)Add Nl Func Def Empty|(455)Remove Nl Func Def Empty|(455)Force Nl Func Def Empty"
-ValueDefault=ignore
-
-[Nl Func Call Empty]
-Category=3
-Description="<html>(456)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
-ChoicesReadable="(456)Ignore Nl Func Call Empty|(456)Add Nl Func Call Empty|(456)Remove Nl Func Call Empty|(456)Force Nl Func Call Empty"
-ValueDefault=ignore
-
-[Nl Func Call Start]
-Category=3
-Description="<html>(457)Whether to add a newline after '(' in a function call,<br/>has preference over nl_func_call_start_multi_line.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_start=ignore|nl_func_call_start=add|nl_func_call_start=remove|nl_func_call_start=force
-ChoicesReadable="(457)Ignore Nl Func Call Start|(457)Add Nl Func Call Start|(457)Remove Nl Func Call Start|(457)Force Nl Func Call Start"
-ValueDefault=ignore
-
-[Nl Func Call End]
-Category=3
-Description="<html>(458)Whether to add a newline before ')' in a function call.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_func_call_end=ignore|nl_func_call_end=add|nl_func_call_end=remove|nl_func_call_end=force
-ChoicesReadable="(458)Ignore Nl Func Call End|(458)Add Nl Func Call End|(458)Remove Nl Func Call End|(458)Force Nl Func Call End"
-ValueDefault=ignore
-
-[Nl Func Call Start Multi Line]
-Category=3
-Description="<html>(459)Whether to add a newline after '(' in a function call if '(' and ')' are in<br/>different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_start_multi_line=true|nl_func_call_start_multi_line=false
-ValueDefault=false
-
-[Nl Func Call Args Multi Line]
-Category=3
-Description="<html>(460)Whether to add a newline after each ',' in a function call if '(' and ')'<br/>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
-
-[Nl Func Call End Multi Line]
-Category=3
-Description="<html>(461)Whether to add a newline before ')' in a function call if '(' and ')' are in<br/>different lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_end_multi_line=true|nl_func_call_end_multi_line=false
-ValueDefault=false
-
-[Nl Func Call Args Multi Line Ignore Closures]
-Category=3
-Description="<html>(462)Whether to respect nl_func_call_XXX option incase of closure args.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_func_call_args_multi_line_ignore_closures=true|nl_func_call_args_multi_line_ignore_closures=false
-ValueDefault=false
-
-[Nl Template Start]
-Category=3
-Description="<html>(463)Whether to add a newline after '&lt;' of a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_start=true|nl_template_start=false
-ValueDefault=false
-
-[Nl Template Args]
-Category=3
-Description="<html>(464)Whether to add a newline after each ',' in a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_args=true|nl_template_args=false
-ValueDefault=false
-
-[Nl Template End]
-Category=3
-Description="<html>(465)Whether to add a newline before '&gt;' of a template parameter list.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_template_end=true|nl_template_end=false
-ValueDefault=false
-
-[Nl Oc Msg Args]
-Category=3
-Description="<html>(466)(OC) Whether to put each Objective-C 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
-
-[Nl Fdef Brace]
-Category=3
-Description="<html>(467)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
-ChoicesReadable="(467)Ignore Nl Fdef Brace|(467)Add Nl Fdef Brace|(467)Remove Nl Fdef Brace|(467)Force Nl Fdef Brace"
-ValueDefault=ignore
-
-[Nl Fdef Brace Cond]
-Category=3
-Description="<html>(468)Add or remove newline between function signature and '{',<br/>if signature ends with ')'. Overrides nl_fdef_brace.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_fdef_brace_cond=ignore|nl_fdef_brace_cond=add|nl_fdef_brace_cond=remove|nl_fdef_brace_cond=force
-ChoicesReadable="(468)Ignore Nl Fdef Brace Cond|(468)Add Nl Fdef Brace Cond|(468)Remove Nl Fdef Brace Cond|(468)Force Nl Fdef Brace Cond"
-ValueDefault=ignore
-
-[Nl Cpp Ldef Brace]
-Category=3
-Description="<html>(469)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
-ChoicesReadable="(469)Ignore Nl Cpp Ldef Brace|(469)Add Nl Cpp Ldef Brace|(469)Remove Nl Cpp Ldef Brace|(469)Force Nl Cpp Ldef Brace"
-ValueDefault=ignore
-
-[Nl Return Expr]
-Category=3
-Description="<html>(470)Add or remove newline between 'return' and the return expression.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return_expr=force
-ChoicesReadable="(470)Ignore Nl Return Expr|(470)Add Nl Return Expr|(470)Remove Nl Return Expr|(470)Force Nl Return Expr"
-ValueDefault=ignore
-
-[Nl After Semicolon]
-Category=3
-Description="<html>(471)Whether to add a newline after semicolons, except in 'for' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_semicolon=true|nl_after_semicolon=false
-ValueDefault=false
-
-[Nl Paren Dbrace Open]
-Category=3
-Description="<html>(472)(Java) Add or remove newline between the ')' and '{{' of the double brace<br/>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
-ChoicesReadable="(472)Ignore Nl Paren Dbrace Open|(472)Add Nl Paren Dbrace Open|(472)Remove Nl Paren Dbrace Open|(472)Force Nl Paren Dbrace Open"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst]
-Category=3
-Description="<html>(473)Whether to add a newline after the type in an unnamed temporary<br/>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
-ChoicesReadable="(473)Ignore Nl Type Brace Init Lst|(473)Add Nl Type Brace Init Lst|(473)Remove Nl Type Brace Init Lst|(473)Force Nl Type Brace Init Lst"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst Open]
-Category=3
-Description="<html>(474)Whether to add a newline after the open brace in an unnamed temporary<br/>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
-ChoicesReadable="(474)Ignore Nl Type Brace Init Lst Open|(474)Add Nl Type Brace Init Lst Open|(474)Remove Nl Type Brace Init Lst Open|(474)Force Nl Type Brace Init Lst Open"
-ValueDefault=ignore
-
-[Nl Type Brace Init Lst Close]
-Category=3
-Description="<html>(475)Whether to add a newline before the close brace in an unnamed temporary<br/>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
-ChoicesReadable="(475)Ignore Nl Type Brace Init Lst Close|(475)Add Nl Type Brace Init Lst Close|(475)Remove Nl Type Brace Init Lst Close|(475)Force Nl Type Brace Init Lst Close"
-ValueDefault=ignore
-
-[Nl After Brace Open]
-Category=3
-Description="<html>(476)Whether to add a newline after '{'. This also adds a newline before the<br/>matching '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_open=true|nl_after_brace_open=false
-ValueDefault=false
-
-[Nl After Brace Open Cmt]
-Category=3
-Description="<html>(477)Whether to add a newline between the open brace and a trailing single-line<br/>comment. Requires nl_after_brace_open=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_open_cmt=true|nl_after_brace_open_cmt=false
-ValueDefault=false
-
-[Nl After Vbrace Open]
-Category=3
-Description="<html>(478)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_open=true|nl_after_vbrace_open=false
-ValueDefault=false
-
-[Nl After Vbrace Open Empty]
-Category=3
-Description="<html>(479)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_open_empty=true|nl_after_vbrace_open_empty=false
-ValueDefault=false
-
-[Nl After Brace Close]
-Category=3
-Description="<html>(480)Whether to add a newline after '}'. Does not apply if followed by a<br/>necessary ';'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_brace_close=true|nl_after_brace_close=false
-ValueDefault=false
-
-[Nl After Vbrace Close]
-Category=3
-Description="<html>(481)Whether to add a newline after a virtual brace close,<br/>as in 'if (foo) a++; &lt;here&gt; return;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_vbrace_close=true|nl_after_vbrace_close=false
-ValueDefault=false
-
-[Nl Brace Struct Var]
-Category=3
-Description="<html>(482)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>"
-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
-ChoicesReadable="(482)Ignore Nl Brace Struct Var|(482)Add Nl Brace Struct Var|(482)Remove Nl Brace Struct Var|(482)Force Nl Brace Struct Var"
-ValueDefault=ignore
-
-[Nl Define Macro]
-Category=3
-Description="<html>(483)Whether to alter newlines in '#define' macros.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_define_macro=true|nl_define_macro=false
-ValueDefault=false
-
-[Nl Squeeze Paren Close]
-Category=3
-Description="<html>(484)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_paren_close=true|nl_squeeze_paren_close=false
-ValueDefault=false
-
-[Nl Squeeze Ifdef]
-Category=3
-Description="<html>(485)Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and<br/>'#endif'. Does not affect top-level #ifdefs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_ifdef=true|nl_squeeze_ifdef=false
-ValueDefault=false
-
-[Nl Squeeze Ifdef Top Level]
-Category=3
-Description="<html>(486)Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_squeeze_ifdef_top_level=true|nl_squeeze_ifdef_top_level=false
-ValueDefault=false
-
-[Nl Before If]
-Category=3
-Description="<html>(487)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
-ChoicesReadable="(487)Ignore Nl Before If|(487)Add Nl Before If|(487)Remove Nl Before If|(487)Force Nl Before If"
-ValueDefault=ignore
-
-[Nl After If]
-Category=3
-Description="<html>(488)Add or remove blank line after 'if' statement. Add/Force work only if the<br/>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
-ChoicesReadable="(488)Ignore Nl After If|(488)Add Nl After If|(488)Remove Nl After If|(488)Force Nl After If"
-ValueDefault=ignore
-
-[Nl Before For]
-Category=3
-Description="<html>(489)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
-ChoicesReadable="(489)Ignore Nl Before For|(489)Add Nl Before For|(489)Remove Nl Before For|(489)Force Nl Before For"
-ValueDefault=ignore
-
-[Nl After For]
-Category=3
-Description="<html>(490)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
-ChoicesReadable="(490)Ignore Nl After For|(490)Add Nl After For|(490)Remove Nl After For|(490)Force Nl After For"
-ValueDefault=ignore
-
-[Nl Before While]
-Category=3
-Description="<html>(491)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
-ChoicesReadable="(491)Ignore Nl Before While|(491)Add Nl Before While|(491)Remove Nl Before While|(491)Force Nl Before While"
-ValueDefault=ignore
-
-[Nl After While]
-Category=3
-Description="<html>(492)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
-ChoicesReadable="(492)Ignore Nl After While|(492)Add Nl After While|(492)Remove Nl After While|(492)Force Nl After While"
-ValueDefault=ignore
-
-[Nl Before Switch]
-Category=3
-Description="<html>(493)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
-ChoicesReadable="(493)Ignore Nl Before Switch|(493)Add Nl Before Switch|(493)Remove Nl Before Switch|(493)Force Nl Before Switch"
-ValueDefault=ignore
-
-[Nl After Switch]
-Category=3
-Description="<html>(494)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
-ChoicesReadable="(494)Ignore Nl After Switch|(494)Add Nl After Switch|(494)Remove Nl After Switch|(494)Force Nl After Switch"
-ValueDefault=ignore
-
-[Nl Before Synchronized]
-Category=3
-Description="<html>(495)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
-ChoicesReadable="(495)Ignore Nl Before Synchronized|(495)Add Nl Before Synchronized|(495)Remove Nl Before Synchronized|(495)Force Nl Before Synchronized"
-ValueDefault=ignore
-
-[Nl After Synchronized]
-Category=3
-Description="<html>(496)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
-ChoicesReadable="(496)Ignore Nl After Synchronized|(496)Add Nl After Synchronized|(496)Remove Nl After Synchronized|(496)Force Nl After Synchronized"
-ValueDefault=ignore
-
-[Nl Before Do]
-Category=3
-Description="<html>(497)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
-ChoicesReadable="(497)Ignore Nl Before Do|(497)Add Nl Before Do|(497)Remove Nl Before Do|(497)Force Nl Before Do"
-ValueDefault=ignore
-
-[Nl After Do]
-Category=3
-Description="<html>(498)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
-ChoicesReadable="(498)Ignore Nl After Do|(498)Add Nl After Do|(498)Remove Nl After Do|(498)Force Nl After Do"
-ValueDefault=ignore
-
-[Nl Before Return]
-Category=3
-Description="<html>(499)Whether to put a blank line before 'return' statements, unless after an open<br/>brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_before_return=true|nl_before_return=false
-ValueDefault=false
-
-[Nl After Return]
-Category=3
-Description="<html>(500)Whether to put a blank line after 'return' statements, unless followed by a<br/>close brace.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_return=true|nl_after_return=false
-ValueDefault=false
-
-[Nl Before Member]
-Category=3
-Description="<html>(501)Whether to put a blank line before a member '.' or '-&gt;' operators.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_before_member=ignore|nl_before_member=add|nl_before_member=remove|nl_before_member=force
-ChoicesReadable="(501)Ignore Nl Before Member|(501)Add Nl Before Member|(501)Remove Nl Before Member|(501)Force Nl Before Member"
-ValueDefault=ignore
-
-[Nl After Member]
-Category=3
-Description="<html>(502)(Java) Whether to put a blank line after a member '.' or '-&gt;' operators.</html>"
-Enabled=false
-EditorType=multiple
-Choices=nl_after_member=ignore|nl_after_member=add|nl_after_member=remove|nl_after_member=force
-ChoicesReadable="(502)Ignore Nl After Member|(502)Add Nl After Member|(502)Remove Nl After Member|(502)Force Nl After Member"
-ValueDefault=ignore
-
-[Nl Ds Struct Enum Cmt]
-Category=3
-Description="<html>(503)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
-
-[Nl Ds Struct Enum Close Brace]
-Category=3
-Description="<html>(504)Whether to force a newline 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
-
-[Nl Class Colon]
-Category=3
-Description="<html>(505)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>"
-Enabled=false
-EditorType=multiple
-Choices=nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force
-ChoicesReadable="(505)Ignore Nl Class Colon|(505)Add Nl Class Colon|(505)Remove Nl Class Colon|(505)Force Nl Class Colon"
-ValueDefault=ignore
-
-[Nl Constr Colon]
-Category=3
-Description="<html>(506)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>"
-Enabled=false
-EditorType=multiple
-Choices=nl_constr_colon=ignore|nl_constr_colon=add|nl_constr_colon=remove|nl_constr_colon=force
-ChoicesReadable="(506)Ignore Nl Constr Colon|(506)Add Nl Constr Colon|(506)Remove Nl Constr Colon|(506)Force Nl Constr Colon"
-ValueDefault=ignore
-
-[Nl Namespace Two To One Liner]
-Category=3
-Description="<html>(507)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_namespace_two_to_one_liner=true|nl_namespace_two_to_one_liner=false
-ValueDefault=false
-
-[Nl Create If One Liner]
-Category=3
-Description="<html>(508)Whether to remove a newline in simple unbraced if statements, turning them<br/>into one-liners, as in '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
-
-[Nl Create For One Liner]
-Category=3
-Description="<html>(509)Whether to remove a newline in simple unbraced for statements, turning them<br/>into one-liners, as in 'for (...)\n stmt;' =&gt; 'for (...) stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_for_one_liner=true|nl_create_for_one_liner=false
-ValueDefault=false
-
-[Nl Create While One Liner]
-Category=3
-Description="<html>(510)Whether to remove a newline in simple unbraced while statements, turning<br/>them into one-liners, as in 'while (expr)\n stmt;' =&gt; 'while (expr) stmt;'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_while_one_liner=true|nl_create_while_one_liner=false
-ValueDefault=false
-
-[Nl Create Func Def One Liner]
-Category=3
-Description="<html>(511)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_func_def_one_liner=true|nl_create_func_def_one_liner=false
-ValueDefault=false
-
-[Nl Create List One Liner]
-Category=3
-Description="<html>(512)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_create_list_one_liner=true|nl_create_list_one_liner=false
-ValueDefault=false
-
-[Nl Split If One Liner]
-Category=3
-Description="<html>(513)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_if_one_liner=true|nl_split_if_one_liner=false
-ValueDefault=false
-
-[Nl Split For One Liner]
-Category=3
-Description="<html>(514)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_for_one_liner=true|nl_split_for_one_liner=false
-ValueDefault=false
-
-[Nl Split While One Liner]
-Category=3
-Description="<html>(515)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_split_while_one_liner=true|nl_split_while_one_liner=false
-ValueDefault=false
-
-[Donot Add Nl Before Cpp Comment]
-Category=3
-Description="<html>(516)Don't add a newline before a cpp-comment in a parameter list of a function<br/>call.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=donot_add_nl_before_cpp_comment=true|donot_add_nl_before_cpp_comment=false
-ValueDefault=false
-
-[Nl Max]
-Category=4
-Description="<html>(517)The maximum number of consecutive newlines (3 = 2 blank lines).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_max="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Max Blank In Func]
-Category=4
-Description="<html>(518)The maximum number of consecutive newlines in a function.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_max_blank_in_func="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Inside Empty Func]
-Category=4
-Description="<html>(519)The number of newlines inside an empty function body.<br/>This option is overridden by nl_collapse_empty_body=true</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_inside_empty_func="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Body Proto]
-Category=4
-Description="<html>(520)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>(521)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]
-Category=4
-Description="<html>(522)The number of newlines before a class constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_class_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Func Class Def]
-Category=4
-Description="<html>(523)The number of newlines before a class constructor/destructor definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_func_class_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Proto]
-Category=4
-Description="<html>(524)The number of newlines after a function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Proto Group]
-Category=4
-Description="<html>(525)The number of newlines after a function prototype, if not followed by<br/>another function prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_proto_group="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Class Proto]
-Category=4
-Description="<html>(526)The number of newlines after a class constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_class_proto="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Class Proto Group]
-Category=4
-Description="<html>(527)The number of newlines after a class constructor/destructor prototype,<br/>if not followed by another constructor/destructor prototype.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_class_proto_group="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Class Leave One Liner Groups]
-Category=4
-Description="<html>(528)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>(529)The number of newlines after '}' of a multi-line function body.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Body Class]
-Category=4
-Description="<html>(530)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Func Body One Liner]
-Category=4
-Description="<html>(531)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_func_body_one_liner="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Func Var Def Blk]
-Category=4
-Description="<html>(532)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_func_var_def_blk="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk Start]
-Category=4
-Description="<html>(533)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_start="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk End]
-Category=4
-Description="<html>(534)The number of newlines after a block of typedefs.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_end="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Typedef Blk In]
-Category=4
-Description="<html>(535)The maximum number of consecutive newlines within a block of typedefs.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_typedef_blk_in="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk Start]
-Category=4
-Description="<html>(536)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_start="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk End]
-Category=4
-Description="<html>(537)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_end="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Var Def Blk In]
-Category=4
-Description="<html>(538)The maximum number of consecutive newlines within a block of variable<br/>definitions.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_var_def_blk_in="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Block Comment]
-Category=4
-Description="<html>(539)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="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before C Comment]
-Category=4
-Description="<html>(540)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="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Cpp Comment]
-Category=4
-Description="<html>(541)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="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Multiline Comment]
-Category=4
-Description="<html>(542)Whether to force a newline after a multi-line comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_multiline_comment=true|nl_after_multiline_comment=false
-ValueDefault=false
-
-[Nl After Label Colon]
-Category=4
-Description="<html>(543)Whether to force a newline after a label's colon.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=nl_after_label_colon=true|nl_after_label_colon=false
-ValueDefault=false
-
-[Nl After Struct]
-Category=4
-Description="<html>(544)The number of newlines after '}' or ';' of a struct/enum/union definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_struct="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Class]
-Category=4
-Description="<html>(545)The number of newlines before a class definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Class]
-Category=4
-Description="<html>(546)The number of newlines after '}' or ';' of a class definition.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_class="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Namespace]
-Category=4
-Description="<html>(547)The number of newlines before a namespace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Inside Namespace]
-Category=4
-Description="<html>(548)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
-
-[Nl After Namespace]
-Category=4
-Description="<html>(549)The number of newlines after '}' of a namespace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_namespace="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Access Spec]
-Category=4
-Description="<html>(550)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_access_spec="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Access Spec]
-Category=4
-Description="<html>(551)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_access_spec="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Comment Func Def]
-Category=4
-Description="<html>(552)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_comment_func_def="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Try Catch Finally]
-Category=4
-Description="<html>(553)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_try_catch_finally="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Around Cs Property]
-Category=4
-Description="<html>(554)(C#) The number of newlines before and after a property, indexer or event<br/>declaration.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_around_cs_property="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Between Get Set]
-Category=4
-Description="<html>(555)(C#) The number of newlines between the get/set/add/remove handlers.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_between_get_set="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Property Brace]
-Category=4
-Description="<html>(556)(C#) Add or remove newline between 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
-ChoicesReadable="(556)Ignore Nl Property Brace|(556)Add Nl Property Brace|(556)Remove Nl Property Brace|(556)Force Nl Property Brace"
-ValueDefault=ignore
-
-[Eat Blanks After Open Brace]
-Category=4
-Description="<html>(557)Whether to remove blank lines after '{'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=eat_blanks_after_open_brace=true|eat_blanks_after_open_brace=false
-ValueDefault=false
-
-[Eat Blanks Before Close Brace]
-Category=4
-Description="<html>(558)Whether to remove blank lines before '}'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=eat_blanks_before_close_brace=true|eat_blanks_before_close_brace=false
-ValueDefault=false
-
-[Nl Remove Extra Newlines]
-Category=4
-Description="<html>(559)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>"
-Enabled=false
-EditorType=numeric
-CallName="nl_remove_extra_newlines="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Nl After Annotation]
-Category=4
-Description="<html>(560)(Java) Add or remove newline after an annotation statement. Only affects<br/>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
-ChoicesReadable="(560)Ignore Nl After Annotation|(560)Add Nl After Annotation|(560)Remove Nl After Annotation|(560)Force Nl After Annotation"
-ValueDefault=ignore
-
-[Nl Between Annotation]
-Category=4
-Description="<html>(561)(Java) Add or remove 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
-ChoicesReadable="(561)Ignore Nl Between Annotation|(561)Add Nl Between Annotation|(561)Remove Nl Between Annotation|(561)Force Nl Between Annotation"
-ValueDefault=ignore
-
-[Nl Before Whole File Ifdef]
-Category=4
-Description="<html>(562)The number of newlines before a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_whole_file_ifdef="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Whole File Ifdef]
-Category=4
-Description="<html>(563)The number of newlines after a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_whole_file_ifdef="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl Before Whole File Endif]
-Category=4
-Description="<html>(564)The number of newlines before a whole-file #endif.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_before_whole_file_endif="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Nl After Whole File Endif]
-Category=4
-Description="<html>(565)The number of newlines after a whole-file #endif.<br/><br/>0: No change (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="nl_after_whole_file_endif="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Pos Arith]
-Category=5
-Description="<html>(566)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
-ChoicesReadable="(566)Ignore Pos Arith|(566)Break Pos Arith|(566)Force Pos Arith|(566)Lead Pos Arith|(566)Trail Pos Arith|(566)Join Pos Arith|(566)Lead Break Pos Arith|(566)Lead Force Pos Arith|(566)Trail Break Pos Arith|(566)Trail Force Pos Arith"
-ValueDefault=ignore
-
-[Pos Assign]
-Category=5
-Description="<html>(567)The position of assignment in wrapped expressions. Do not affect '='<br/>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
-ChoicesReadable="(567)Ignore Pos Assign|(567)Break Pos Assign|(567)Force Pos Assign|(567)Lead Pos Assign|(567)Trail Pos Assign|(567)Join Pos Assign|(567)Lead Break Pos Assign|(567)Lead Force Pos Assign|(567)Trail Break Pos Assign|(567)Trail Force Pos Assign"
-ValueDefault=ignore
-
-[Pos Bool]
-Category=5
-Description="<html>(568)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
-ChoicesReadable="(568)Ignore Pos Bool|(568)Break Pos Bool|(568)Force Pos Bool|(568)Lead Pos Bool|(568)Trail Pos Bool|(568)Join Pos Bool|(568)Lead Break Pos Bool|(568)Lead Force Pos Bool|(568)Trail Break Pos Bool|(568)Trail Force Pos Bool"
-ValueDefault=ignore
-
-[Pos Compare]
-Category=5
-Description="<html>(569)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
-ChoicesReadable="(569)Ignore Pos Compare|(569)Break Pos Compare|(569)Force Pos Compare|(569)Lead Pos Compare|(569)Trail Pos Compare|(569)Join Pos Compare|(569)Lead Break Pos Compare|(569)Lead Force Pos Compare|(569)Trail Break Pos Compare|(569)Trail Force Pos Compare"
-ValueDefault=ignore
-
-[Pos Conditional]
-Category=5
-Description="<html>(570)The position of conditional operators, as in the '?' and ':' of<br/>'expr ? stmt : stmt', 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
-ChoicesReadable="(570)Ignore Pos Conditional|(570)Break Pos Conditional|(570)Force Pos Conditional|(570)Lead Pos Conditional|(570)Trail Pos Conditional|(570)Join Pos Conditional|(570)Lead Break Pos Conditional|(570)Lead Force Pos Conditional|(570)Trail Break Pos Conditional|(570)Trail Force Pos Conditional"
-ValueDefault=ignore
-
-[Pos Comma]
-Category=5
-Description="<html>(571)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
-ChoicesReadable="(571)Ignore Pos Comma|(571)Break Pos Comma|(571)Force Pos Comma|(571)Lead Pos Comma|(571)Trail Pos Comma|(571)Join Pos Comma|(571)Lead Break Pos Comma|(571)Lead Force Pos Comma|(571)Trail Break Pos Comma|(571)Trail Force Pos Comma"
-ValueDefault=ignore
-
-[Pos Enum Comma]
-Category=5
-Description="<html>(572)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
-ChoicesReadable="(572)Ignore Pos Enum Comma|(572)Break Pos Enum Comma|(572)Force Pos Enum Comma|(572)Lead Pos Enum Comma|(572)Trail Pos Enum Comma|(572)Join Pos Enum Comma|(572)Lead Break Pos Enum Comma|(572)Lead Force Pos Enum Comma|(572)Trail Break Pos Enum Comma|(572)Trail Force Pos Enum Comma"
-ValueDefault=ignore
-
-[Pos Class Comma]
-Category=5
-Description="<html>(573)The position of the comma in the base class list if there is more than one<br/>line. Affects 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
-ChoicesReadable="(573)Ignore Pos Class Comma|(573)Break Pos Class Comma|(573)Force Pos Class Comma|(573)Lead Pos Class Comma|(573)Trail Pos Class Comma|(573)Join Pos Class Comma|(573)Lead Break Pos Class Comma|(573)Lead Force Pos Class Comma|(573)Trail Break Pos Class Comma|(573)Trail Force Pos Class Comma"
-ValueDefault=ignore
-
-[Pos Constr Comma]
-Category=5
-Description="<html>(574)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
-ChoicesReadable="(574)Ignore Pos Constr Comma|(574)Break Pos Constr Comma|(574)Force Pos Constr Comma|(574)Lead Pos Constr Comma|(574)Trail Pos Constr Comma|(574)Join Pos Constr Comma|(574)Lead Break Pos Constr Comma|(574)Lead Force Pos Constr Comma|(574)Trail Break Pos Constr Comma|(574)Trail Force Pos Constr Comma"
-ValueDefault=ignore
-
-[Pos Class Colon]
-Category=5
-Description="<html>(575)The position of trailing/leading class colon, between class and base class<br/>list. Affects 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
-ChoicesReadable="(575)Ignore Pos Class Colon|(575)Break Pos Class Colon|(575)Force Pos Class Colon|(575)Lead Pos Class Colon|(575)Trail Pos Class Colon|(575)Join Pos Class Colon|(575)Lead Break Pos Class Colon|(575)Lead Force Pos Class Colon|(575)Trail Break Pos Class Colon|(575)Trail Force Pos Class Colon"
-ValueDefault=ignore
-
-[Pos Constr Colon]
-Category=5
-Description="<html>(576)The position of colons between constructor and member initialization.<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
-ChoicesReadable="(576)Ignore Pos Constr Colon|(576)Break Pos Constr Colon|(576)Force Pos Constr Colon|(576)Lead Pos Constr Colon|(576)Trail Pos Constr Colon|(576)Join Pos Constr Colon|(576)Lead Break Pos Constr Colon|(576)Lead Force Pos Constr Colon|(576)Trail Break Pos Constr Colon|(576)Trail Force Pos Constr Colon"
-ValueDefault=ignore
-
-[Pos Shift]
-Category=5
-Description="<html>(577)The position of shift operators in wrapped expressions.</html>"
-Enabled=false
-EditorType=multiple
-Choices=pos_shift=ignore|pos_shift=break|pos_shift=force|pos_shift=lead|pos_shift=trail|pos_shift=join|pos_shift=lead_break|pos_shift=lead_force|pos_shift=trail_break|pos_shift=trail_force
-ChoicesReadable="(577)Ignore Pos Shift|(577)Break Pos Shift|(577)Force Pos Shift|(577)Lead Pos Shift|(577)Trail Pos Shift|(577)Join Pos Shift|(577)Lead Break Pos Shift|(577)Lead Force Pos Shift|(577)Trail Break Pos Shift|(577)Trail Force Pos Shift"
-ValueDefault=ignore
-
-[Code Width]
-Category=6
-Description="<html>(578)Try to limit code width to N columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="code_width="
-MinVal=0
-MaxVal=10000
-ValueDefault=0
-
-[Ls For Split Full]
-Category=6
-Description="<html>(579)Whether to fully split long 'for' statements at semi-colons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_for_split_full=true|ls_for_split_full=false
-ValueDefault=false
-
-[Ls Func Split Full]
-Category=6
-Description="<html>(580)Whether to fully split long function prototypes/calls at commas.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_func_split_full=true|ls_func_split_full=false
-ValueDefault=false
-
-[Ls Code Width]
-Category=6
-Description="<html>(581)Whether to split lines as close to code_width as possible and ignore some<br/>groupings.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=ls_code_width=true|ls_code_width=false
-ValueDefault=false
-
-[Align Keep Tabs]
-Category=7
-Description="<html>(582)Whether to keep non-indenting tabs.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_keep_tabs=true|align_keep_tabs=false
-ValueDefault=false
-
-[Align With Tabs]
-Category=7
-Description="<html>(583)Whether to use tabs for aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_with_tabs=true|align_with_tabs=false
-ValueDefault=false
-
-[Align On Tabstop]
-Category=7
-Description="<html>(584)Whether to bump out to the next tab when aligning.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_on_tabstop=true|align_on_tabstop=false
-ValueDefault=false
-
-[Align Number Right]
-Category=7
-Description="<html>(585)Whether to right-align numbers.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_number_right=true|align_number_right=false
-ValueDefault=false
-
-[Align Keep Extra Space]
-Category=7
-Description="<html>(586)Whether to keep whitespace not required for alignment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_keep_extra_space=true|align_keep_extra_space=false
-ValueDefault=false
-
-[Align Func Params]
-Category=7
-Description="<html>(587)Whether to align variable definitions in prototypes and functions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_func_params=true|align_func_params=false
-ValueDefault=false
-
-[Align Func Params Span]
-Category=7
-Description="<html>(588)The span for aligning parameter definitions in function on parameter name.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Func Params Thresh]
-Category=7
-Description="<html>(589)The threshold for aligning function parameter definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Params Gap]
-Category=7
-Description="<html>(590)The gap for aligning function parameter definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_params_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Constr Value Span]
-Category=7
-Description="<html>(591)The span for aligning constructor value.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Constr Value Thresh]
-Category=7
-Description="<html>(592)The threshold for aligning constructor value.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Constr Value Gap]
-Category=7
-Description="<html>(593)The gap for aligning constructor value.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_constr_value_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Same Func Call Params]
-Category=7
-Description="<html>(594)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_same_func_call_params=true|align_same_func_call_params=false
-ValueDefault=false
-
-[Align Same Func Call Params Span]
-Category=7
-Description="<html>(595)The span for aligning function-call parameters for single line functions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_same_func_call_params_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Same Func Call Params Thresh]
-Category=7
-Description="<html>(596)The threshold for aligning function-call parameters for single line<br/>functions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_same_func_call_params_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Span]
-Category=7
-Description="<html>(597)The span for aligning variable definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Star Style]
-Category=7
-Description="<html>(598)How to consider (or treat) the '*' in the alignment of 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;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_star_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Var Def Amp Style]
-Category=7
-Description="<html>(599)How to consider (or treat) the '&amp;' in the alignment of 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;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_amp_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Var Def Thresh]
-Category=7
-Description="<html>(600)The threshold for aligning variable definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Def Gap]
-Category=7
-Description="<html>(601)The gap for aligning variable definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Def Colon]
-Category=7
-Description="<html>(602)Whether to align the colon in struct bit fields.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_colon=true|align_var_def_colon=false
-ValueDefault=false
-
-[Align Var Def Colon Gap]
-Category=7
-Description="<html>(603)The gap for aligning the colon in struct bit fields.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_def_colon_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Def Attribute]
-Category=7
-Description="<html>(604)Whether to align any attribute after the variable name.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_attribute=true|align_var_def_attribute=false
-ValueDefault=false
-
-[Align Var Def Inline]
-Category=7
-Description="<html>(605)Whether to align inline struct/enum/union variable definitions.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_var_def_inline=true|align_var_def_inline=false
-ValueDefault=false
-
-[Align Assign Span]
-Category=7
-Description="<html>(606)The span for aligning on '=' in assignments.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Func Proto Span]
-Category=7
-Description="<html>(607)The span for aligning on '=' in function prototype modifier.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_func_proto_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Thresh]
-Category=7
-Description="<html>(608)The threshold for aligning on '=' in assignments.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_assign_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Assign Decl Func]
-Category=7
-Description="<html>(609)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>(610)The span for aligning on '=' in enums.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_enum_equ_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Enum Equ Thresh]
-Category=7
-Description="<html>(611)The threshold for aligning on '=' in enums.<br/>Use a negative number for absolute thresholds.<br/><br/>0: no limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_enum_equ_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Span]
-Category=7
-Description="<html>(612)The span for aligning class member definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Thresh]
-Category=7
-Description="<html>(613)The threshold for aligning class member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Class Gap]
-Category=7
-Description="<html>(614)The gap for aligning class member definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_class_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Var Struct Span]
-Category=7
-Description="<html>(615)The span for aligning struct/union member definitions.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Struct Thresh]
-Category=7
-Description="<html>(616)The threshold for aligning struct/union member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Var Struct Gap]
-Category=7
-Description="<html>(617)The gap for aligning struct/union member definitions.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_var_struct_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Struct Init Span]
-Category=7
-Description="<html>(618)The span for aligning struct initializer values.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_struct_init_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Typedef Span]
-Category=7
-Description="<html>(619)The span for aligning single-line typedefs.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_span="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Typedef Gap]
-Category=7
-Description="<html>(620)The minimum space between the type and the synonym of a typedef.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Typedef Func]
-Category=7
-Description="<html>(621)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>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_func="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Typedef Star Style]
-Category=7
-Description="<html>(622)How to consider (or treat) the '*' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int * pint;' (default)<br/>1: Part of type name:        'typedef int   *pint;'<br/>2: Dangling:                 'typedef int  *pint;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_star_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Typedef Amp Style]
-Category=7
-Description="<html>(623)How to consider (or treat) the '&amp;' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int &amp; intref;' (default)<br/>1: Part of type name:        'typedef int   &amp;intref;'<br/>2: Dangling:                 'typedef int  &amp;intref;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_typedef_amp_style="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Align Right Cmt Span]
-Category=7
-Description="<html>(624)The span for aligning comments that end lines.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Right Cmt Gap]
-Category=7
-Description="<html>(625)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>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Right Cmt Mix]
-Category=7
-Description="<html>(626)If aligning comments, whether to mix with comments after '}' and #endif with<br/>less than three 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>(627)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
-
-[Align Right Cmt At Col]
-Category=7
-Description="<html>(628)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>"
-Enabled=false
-EditorType=numeric
-CallName="align_right_cmt_at_col="
-MinVal=0
-MaxVal=200
-ValueDefault=0
-
-[Align Func Proto Span]
-Category=7
-Description="<html>(629)The span for aligning function prototypes.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Proto Thresh]
-Category=7
-Description="<html>(630)The threshold for aligning function prototypes.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_thresh="
-MinVal=-1000
-MaxVal=5000
-ValueDefault=0
-
-[Align Func Proto Gap]
-Category=7
-Description="<html>(631)Minimum gap between the return type and the function name.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_func_proto_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align On Operator]
-Category=7
-Description="<html>(632)Whether to align function prototypes on the 'operator' keyword instead of<br/>what follows.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_on_operator=true|align_on_operator=false
-ValueDefault=false
-
-[Align Mix Var Proto]
-Category=7
-Description="<html>(633)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_mix_var_proto=true|align_mix_var_proto=false
-ValueDefault=false
-
-[Align Single Line Func]
-Category=7
-Description="<html>(634)Whether to align single-line functions with function prototypes.<br/>Uses align_func_proto_span.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_single_line_func=true|align_single_line_func=false
-ValueDefault=false
-
-[Align Single Line Brace]
-Category=7
-Description="<html>(635)Whether to align 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
-
-[Align Single Line Brace Gap]
-Category=7
-Description="<html>(636)Gap for align_single_line_brace.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_single_line_brace_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Oc Msg Spec Span]
-Category=7
-Description="<html>(637)(OC) The span for aligning Objective-C message specifications.<br/><br/>0: Don't align (default).</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_oc_msg_spec_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Nl Cont]
-Category=7
-Description="<html>(638)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_nl_cont=true|align_nl_cont=false
-ValueDefault=false
-
-[Align Pp Define Together]
-Category=7
-Description="<html>(639)Whether to align macro functions and variables together.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_pp_define_together=true|align_pp_define_together=false
-ValueDefault=false
-
-[Align Pp Define Span]
-Category=7
-Description="<html>(640)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>"
-Enabled=false
-EditorType=numeric
-CallName="align_pp_define_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Pp Define Gap]
-Category=7
-Description="<html>(641)The minimum space between label and value of a preprocessor define.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_pp_define_gap="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Align Left Shift]
-Category=7
-Description="<html>(642)Whether to align lines that start with '&lt;&lt;' with previous '&lt;&lt;'.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_left_shift=true|align_left_shift=false
-ValueDefault=true
-
-[Align Eigen Comma Init]
-Category=7
-Description="<html>(643)Whether to align comma-separated statements following '&lt;&lt;' (as used to<br/>initialize Eigen matrices).</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_eigen_comma_init=true|align_eigen_comma_init=false
-ValueDefault=false
-
-[Align Asm Colon]
-Category=7
-Description="<html>(644)Whether to align text after 'asm volatile ()' colons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_asm_colon=true|align_asm_colon=false
-ValueDefault=false
-
-[Align Oc Msg Colon Span]
-Category=7
-Description="<html>(645)(OC) Span for aligning parameters in an Objective-C message call<br/>on the ':'.<br/><br/>0: Don't align.</html>"
-Enabled=false
-EditorType=numeric
-CallName="align_oc_msg_colon_span="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Align Oc Msg Colon First]
-Category=7
-Description="<html>(646)(OC) Whether to always align with the first parameter, even if it is too<br/>short.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_msg_colon_first=true|align_oc_msg_colon_first=false
-ValueDefault=false
-
-[Align Oc Decl Colon]
-Category=7
-Description="<html>(647)(OC) Whether to align parameters in an Objective-C '+' or '-' declaration<br/>on the ':'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_decl_colon=true|align_oc_decl_colon=false
-ValueDefault=false
-
-[Align Oc Msg Colon Xcode Like]
-Category=7
-Description="<html>(648)(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>aligment)</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
-ValueDefault=false
-
-[Cmt Width]
-Category=8
-Description="<html>(649)Try to wrap comments at N columns.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_width="
-MinVal=0
-MaxVal=256
-ValueDefault=0
-
-[Cmt Reflow Mode]
-Category=8
-Description="<html>(650)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>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_reflow_mode="
-MinVal=0
-MaxVal=2
-ValueDefault=0
-
-[Cmt Convert Tab To Spaces]
-Category=8
-Description="<html>(651)Whether to convert all tabs to spaces in comments. If false, tabs in<br/>comments are left 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
-
-[Cmt Indent Multi]
-Category=8
-Description="<html>(652)Whether to apply changes to multi-line comments, including cmt_width,<br/>keyword substitution and leading chars.<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false
-ValueDefault=true
-
-[Cmt C Group]
-Category=8
-Description="<html>(653)Whether to group c-comments that look like they are in a block.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_group=true|cmt_c_group=false
-ValueDefault=false
-
-[Cmt C Nl Start]
-Category=8
-Description="<html>(654)Whether to put an empty '/*' on the first line of the combined c-comment.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_c_nl_start=true|cmt_c_nl_start=false
-ValueDefault=false
-
-[Cmt C Nl End]
-Category=8
-Description="<html>(655)Whether to add 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>(656)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
-
-[Cmt Cpp Group]
-Category=8
-Description="<html>(657)Whether to group cpp-comments that look like they are in a block. Only<br/>meaningful if cmt_cpp_to_c=true.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_group=true|cmt_cpp_group=false
-ValueDefault=false
-
-[Cmt Cpp Nl Start]
-Category=8
-Description="<html>(658)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_nl_start=true|cmt_cpp_nl_start=false
-ValueDefault=false
-
-[Cmt Cpp Nl End]
-Category=8
-Description="<html>(659)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_cpp_nl_end=true|cmt_cpp_nl_end=false
-ValueDefault=false
-
-[Cmt Star Cont]
-Category=8
-Description="<html>(660)Whether to put a star on subsequent comment lines.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_star_cont=true|cmt_star_cont=false
-ValueDefault=false
-
-[Cmt Sp Before Star Cont]
-Category=8
-Description="<html>(661)The number of spaces to insert at the start of subsequent comment lines.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_before_star_cont="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Cmt Sp After Star Cont]
-Category=8
-Description="<html>(662)The number of spaces to insert after the star on subsequent comment lines.</html>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_sp_after_star_cont="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Cmt Multi Check Last]
-Category=8
-Description="<html>(663)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_multi_check_last=true|cmt_multi_check_last=false
-ValueDefault=true
-
-[Cmt Multi First Len Minimum]
-Category=8
-Description="<html>(664)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>"
-Enabled=false
-EditorType=numeric
-CallName="cmt_multi_first_len_minimum="
-MinVal=1
-MaxVal=20
-ValueDefault=4
-
-[Cmt Insert File Header]
-Category=8
-Description="<html>(665)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>"
-Enabled=false
-CallName=cmt_insert_file_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert File Footer]
-Category=8
-Description="<html>(666)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>"
-Enabled=false
-CallName=cmt_insert_file_footer=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Func Header]
-Category=8
-Description="<html>(667)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>"
-Enabled=false
-CallName=cmt_insert_func_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Class Header]
-Category=8
-Description="<html>(668)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>"
-Enabled=false
-CallName=cmt_insert_class_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Oc Msg Header]
-Category=8
-Description="<html>(669)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>"
-Enabled=false
-CallName=cmt_insert_oc_msg_header=
-EditorType=string
-ValueDefault=
-
-[Cmt Insert Before Preproc]
-Category=8
-Description="<html>(670)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_preproc=true|cmt_insert_before_preproc=false
-ValueDefault=false
-
-[Cmt Insert Before Inlines]
-Category=8
-Description="<html>(671)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_inlines=true|cmt_insert_before_inlines=false
-ValueDefault=true
-
-[Cmt Insert Before Ctor Dtor]
-Category=8
-Description="<html>(672)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=cmt_insert_before_ctor_dtor=true|cmt_insert_before_ctor_dtor=false
-ValueDefault=false
-
-[Mod Full Brace Do]
-Category=9
-Description="<html>(673)Add or remove braces on a 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
-ChoicesReadable="(673)Ignore Mod Full Brace Do|(673)Add Mod Full Brace Do|(673)Remove Mod Full Brace Do|(673)Force Mod Full Brace Do"
-ValueDefault=ignore
-
-[Mod Full Brace For]
-Category=9
-Description="<html>(674)Add or remove braces on a 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
-ChoicesReadable="(674)Ignore Mod Full Brace For|(674)Add Mod Full Brace For|(674)Remove Mod Full Brace For|(674)Force Mod Full Brace For"
-ValueDefault=ignore
-
-[Mod Full Brace Function]
-Category=9
-Description="<html>(675)(Pawn) Add or remove braces on a single-line function definition.</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
-ChoicesReadable="(675)Ignore Mod Full Brace Function|(675)Add Mod Full Brace Function|(675)Remove Mod Full Brace Function|(675)Force Mod Full Brace Function"
-ValueDefault=ignore
-
-[Mod Full Brace If]
-Category=9
-Description="<html>(676)Add or remove braces on a single-line 'if' statement. Braces will not be<br/>removed if the braced statement contains 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
-ChoicesReadable="(676)Ignore Mod Full Brace If|(676)Add Mod Full Brace If|(676)Remove Mod Full Brace If|(676)Force Mod Full Brace If"
-ValueDefault=ignore
-
-[Mod Full Brace If Chain]
-Category=9
-Description="<html>(677)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
-ValueDefault=false
-
-[Mod Full Brace If Chain Only]
-Category=9
-Description="<html>(678)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>"
-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>(679)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="(679)Ignore Mod Full Brace While|(679)Add Mod Full Brace While|(679)Remove Mod Full Brace While|(679)Force Mod Full Brace While"
-ValueDefault=ignore
-
-[Mod Full Brace Using]
-Category=9
-Description="<html>(680)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="(680)Ignore Mod Full Brace Using|(680)Add Mod Full Brace Using|(680)Remove Mod Full Brace Using|(680)Force Mod Full Brace Using"
-ValueDefault=ignore
-
-[Mod Full Brace Nl]
-Category=9
-Description="<html>(681)Don't remove braces around statements that span N newlines</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_full_brace_nl="
-MinVal=0
-MaxVal=5000
-ValueDefault=0
-
-[Mod Full Brace Nl Block Rem Mlcond]
-Category=9
-Description="<html>(682)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_nl_block_rem_mlcond=true|mod_full_brace_nl_block_rem_mlcond=false
-ValueDefault=false
-
-[Mod Paren On Return]
-Category=9
-Description="<html>(683)Add or remove unnecessary parenthesis 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
-ChoicesReadable="(683)Ignore Mod Paren On Return|(683)Add Mod Paren On Return|(683)Remove Mod Paren On Return|(683)Force Mod Paren On Return"
-ValueDefault=ignore
-
-[Mod Pawn Semicolon]
-Category=9
-Description="<html>(684)(Pawn) Whether to change optional semicolons to real semicolons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_pawn_semicolon=true|mod_pawn_semicolon=false
-ValueDefault=false
-
-[Mod Full Paren If Bool]
-Category=9
-Description="<html>(685)Whether to fully parenthesize Boolean expressions in 'while' and 'if'<br/>statement, as in 'if (a &amp;&amp; b &gt; c)' =&gt; 'if (a &amp;&amp; (b &gt; c))'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false
-ValueDefault=false
-
-[Mod Remove Extra Semicolon]
-Category=9
-Description="<html>(686)Whether to remove superfluous semicolons.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_remove_extra_semicolon=true|mod_remove_extra_semicolon=false
-ValueDefault=false
-
-[Mod Add Long Function Closebrace Comment]
-Category=9
-Description="<html>(687)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>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_function_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Namespace Closebrace Comment]
-Category=9
-Description="<html>(688)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>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_namespace_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Class Closebrace Comment]
-Category=9
-Description="<html>(689)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>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_class_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Switch Closebrace Comment]
-Category=9
-Description="<html>(690)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>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_switch_closebrace_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Ifdef Endif Comment]
-Category=9
-Description="<html>(691)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>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_ifdef_endif_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Add Long Ifdef Else Comment]
-Category=9
-Description="<html>(692)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>"
-Enabled=false
-EditorType=numeric
-CallName="mod_add_long_ifdef_else_comment="
-MinVal=0
-MaxVal=255
-ValueDefault=0
-
-[Mod Sort Case Sensitive]
-Category=9
-Description="<html>(693)Whether to take care of the case by the mod_sort_xx options.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_case_sensitive=true|mod_sort_case_sensitive=false
-ValueDefault=false
-
-[Mod Sort Import]
-Category=9
-Description="<html>(694)Whether to sort consecutive single-line 'import' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_import=true|mod_sort_import=false
-ValueDefault=false
-
-[Mod Sort Using]
-Category=9
-Description="<html>(695)(C#) Whether to sort consecutive single-line 'using' statements.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_using=true|mod_sort_using=false
-ValueDefault=false
-
-[Mod Sort Include]
-Category=9
-Description="<html>(696)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_include=true|mod_sort_include=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Filename]
-Category=9
-Description="<html>(697)Whether to prioritize '#include' and '#import' statements that contain<br/>filename without extension when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_filename=true|mod_sort_incl_import_prioritize_filename=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Extensionless]
-Category=9
-Description="<html>(698)Whether to prioritize '#include' and '#import' statements that does not<br/>contain extensions when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_extensionless=true|mod_sort_incl_import_prioritize_extensionless=false
-ValueDefault=false
-
-[Mod Sort Incl Import Prioritize Angle Over Quotes]
-Category=9
-Description="<html>(699)Whether to prioritize '#include' and '#import' statements that contain<br/>angle over quotes when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_prioritize_angle_over_quotes=true|mod_sort_incl_import_prioritize_angle_over_quotes=false
-ValueDefault=false
-
-[Mod Sort Incl Import Ignore Extension]
-Category=9
-Description="<html>(700)Whether to ignore file extension in '#include' and '#import' statements<br/>for sorting comparison.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_ignore_extension=true|mod_sort_incl_import_ignore_extension=false
-ValueDefault=false
-
-[Mod Sort Incl Import Grouping Enabled]
-Category=9
-Description="<html>(701)Whether to group '#include' and '#import' statements when sorting is enabled.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_incl_import_grouping_enabled=true|mod_sort_incl_import_grouping_enabled=false
-ValueDefault=false
-
-[Mod Move Case Break]
-Category=9
-Description="<html>(702)Whether to move a 'break' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } break;' =&gt; 'case X: { ... break; }'.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_move_case_break=true|mod_move_case_break=false
-ValueDefault=false
-
-[Mod Case Brace]
-Category=9
-Description="<html>(703)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>"
-Enabled=false
-EditorType=multiple
-Choices=mod_case_brace=ignore|mod_case_brace=add|mod_case_brace=remove|mod_case_brace=force
-ChoicesReadable="(703)Ignore Mod Case Brace|(703)Add Mod Case Brace|(703)Remove Mod Case Brace|(703)Force Mod Case Brace"
-ValueDefault=ignore
-
-[Mod Remove Empty Return]
-Category=9
-Description="<html>(704)Whether to remove a void 'return;' that appears as the last statement in a<br/>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>(705)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="(705)Ignore Mod Enum Last Comma|(705)Add Mod Enum Last Comma|(705)Remove Mod Enum Last Comma|(705)Force Mod Enum Last Comma"
-ValueDefault=ignore
-
-[Mod Sort Oc Properties]
-Category=9
-Description="<html>(706)(OC) Whether to organize the properties. If true, properties will be<br/>rearranged according to the mod_sort_oc_property_*_weight factors.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=mod_sort_oc_properties=true|mod_sort_oc_properties=false
-ValueDefault=false
-
-[Mod Sort Oc Property Class Weight]
-Category=9
-Description="<html>(707)(OC) Weight of a class property modifier.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_class_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Thread Safe Weight]
-Category=9
-Description="<html>(708)(OC) Weight of 'atomic' and 'nonatomic'.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_thread_safe_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Readwrite Weight]
-Category=9
-Description="<html>(709)(OC) Weight of 'readwrite' when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_readwrite_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Reference Weight]
-Category=9
-Description="<html>(710)(OC) Weight of a reference type specifier ('retain', 'copy', 'assign',<br/>'weak', 'strong') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_reference_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Getter Weight]
-Category=9
-Description="<html>(711)(OC) Weight of getter type ('getter=') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_getter_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Setter Weight]
-Category=9
-Description="<html>(712)(OC) Weight of setter type ('setter=') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_setter_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Mod Sort Oc Property Nullability Weight]
-Category=9
-Description="<html>(713)(OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',<br/>'null_resettable') when organizing properties.</html>"
-Enabled=false
-EditorType=numeric
-CallName="mod_sort_oc_property_nullability_weight="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Pp Indent]
-Category=10
-Description="<html>(714)Add or remove indentation of preprocessor directives inside #if blocks<br/>at brace level 0 (file-level).</html>"
-Enabled=false
-EditorType=multiple
-Choices=pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force
-ChoicesReadable="(714)Ignore Pp Indent|(714)Add Pp Indent|(714)Remove Pp Indent|(714)Force Pp Indent"
-ValueDefault=ignore
-
-[Pp Indent At Level]
-Category=10
-Description="<html>(715)Whether to indent #if/#else/#endif at the brace level. If false, these are<br/>indented from column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false
-ValueDefault=false
-
-[Pp Indent Count]
-Category=10
-Description="<html>(716)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>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_count="
-MinVal=0
-MaxVal=16
-ValueDefault=1
-
-[Pp Space]
-Category=10
-Description="<html>(717)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
-ChoicesReadable="(717)Ignore Pp Space|(717)Add Pp Space|(717)Remove Pp Space|(717)Force Pp Space"
-ValueDefault=ignore
-
-[Pp Space Count]
-Category=10
-Description="<html>(718)Sets the number of spaces per level added with pp_space.</html>"
-Enabled=false
-EditorType=numeric
-CallName="pp_space_count="
-MinVal=0
-MaxVal=16
-ValueDefault=0
-
-[Pp Indent Region]
-Category=10
-Description="<html>(719)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>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_region="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Pp Region Indent Code]
-Category=10
-Description="<html>(720)Whether to indent the code between #region and #endregion.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_region_indent_code=true|pp_region_indent_code=false
-ValueDefault=false
-
-[Pp Indent If]
-Category=10
-Description="<html>(721)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>"
-Enabled=false
-EditorType=numeric
-CallName="pp_indent_if="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
-[Pp If Indent Code]
-Category=10
-Description="<html>(722)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
-
-[Pp Define At Level]
-Category=10
-Description="<html>(723)Whether to indent '#define' at the brace level. If false, these are<br/>indented from column 1.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_define_at_level=true|pp_define_at_level=false
-ValueDefault=false
-
-[Pp Ignore Define Body]
-Category=10
-Description="<html>(724)Whether to ignore the '#define' body while formatting.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_ignore_define_body=true|pp_ignore_define_body=false
-ValueDefault=false
-
-[Pp Indent Case]
-Category=10
-Description="<html>(725)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_case=true|pp_indent_case=false
-ValueDefault=true
-
-[Pp Indent Func Def]
-Category=10
-Description="<html>(726)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_func_def=true|pp_indent_func_def=false
-ValueDefault=true
-
-[Pp Indent Extern]
-Category=10
-Description="<html>(727)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_extern=true|pp_indent_extern=false
-ValueDefault=true
-
-[Pp Indent Brace]
-Category=10
-Description="<html>(728)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=pp_indent_brace=true|pp_indent_brace=false
-ValueDefault=true
-
-[Include Category 0]
-Category=11
-Description="<html>(729)The regex for include category with priority 0.</html>"
-Enabled=false
-CallName=include_category_0=
-EditorType=string
-ValueDefault=
-
-[Include Category 1]
-Category=11
-Description="<html>(730)The regex for include category with priority 1.</html>"
-Enabled=false
-CallName=include_category_1=
-EditorType=string
-ValueDefault=
-
-[Include Category 2]
-Category=11
-Description="<html>(731)The regex for include category with priority 2.</html>"
-Enabled=false
-CallName=include_category_2=
-EditorType=string
-ValueDefault=
-
-[Use Indent Func Call Param]
-Category=12
-Description="<html>(732)true:  indent_func_call_param will be used (default)<br/>false: indent_func_call_param will NOT be used<br/><br/>Default: true</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_indent_func_call_param=true|use_indent_func_call_param=false
-ValueDefault=true
-
-[Use Indent Continue Only Once]
-Category=12
-Description="<html>(733)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
-ValueDefault=false
-
-[Indent Cpp Lambda Only Once]
-Category=12
-Description="<html>(734)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
-ValueDefault=false
-
-[Use Sp After Angle Always]
-Category=12
-Description="<html>(735)Whether sp_after_angle takes precedence over sp_inside_fparen. This was the<br/>historic behavior, but is probably not the desired behavior, so this is off<br/>by default.</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_sp_after_angle_always=true|use_sp_after_angle_always=false
-ValueDefault=false
-
-[Use Options Overriding For Qt Macros]
-Category=12
-Description="<html>(736)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>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_options_overriding_for_qt_macros=true|use_options_overriding_for_qt_macros=false
-ValueDefault=true
-
-[Use Form Feed No More As Whitespace Character]
-Category=12
-Description="<html>(737)If true: the form feed character is removed from the list<br/>of whitespace characters.<br/>See https://en.cppreference.com/w/cpp/string/byte/isspace</html>"
-Enabled=false
-EditorType=boolean
-TrueFalse=use_form_feed_no_more_as_whitespace_character=true|use_form_feed_no_more_as_whitespace_character=false
-ValueDefault=false
-
-[Warn Level Tabs Found In Verbatim String Literals]
-Category=13
-Description="<html>(738)(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>"
-Enabled=false
-EditorType=numeric
-CallName="warn_level_tabs_found_in_verbatim_string_literals="
-MinVal=1
-MaxVal=3
-ValueDefault=2
-
-[Debug Max Number Of Loops]
-Category=13
-Description="<html>(739)Limit the number of loops.<br/>Used by uncrustify.cpp to exit from infinite loop.<br/>0: no limit.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_max_number_of_loops="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Line Number To Protocol]
-Category=13
-Description="<html>(740)Set the number of the line to protocol;<br/>Used in the function prot_the_line if the 2. parameter is zero.<br/>0: nothing protocol.</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_line_number_to_protocol="
-MinVal=
-MaxVal=
-ValueDefault=0
-
-[Debug Timeout]
-Category=13
-Description="<html>(741)Set the number of second(s) before terminating formatting the current file,<br/>0: no timeout.<br/>only for linux</html>"
-Enabled=false
-EditorType=numeric
-CallName="debug_timeout="
-MinVal=
-MaxVal=
-ValueDefault=0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_proto.cpp
deleted file mode 100644
index 9c94ecf5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_proto.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * @file align_func_proto.cpp
- *
- * @author  Guy Maurel
- * split from align.cpp
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "align_func_proto.h"
-
-#include "align_stack.h"
-#include "align_tools.h"
-#include "log_rules.h"
-#include "uncrustify_limits.h"
-
-#include <algorithm>                           // to get max
-
-using namespace uncrustify;
-
-
-void align_func_proto(size_t span)
-{
-   LOG_FUNC_ENTRY();
-
-   size_t myspan   = span;
-   size_t mythresh = 0;
-
-   log_rule_B("align_func_proto_gap");
-   size_t mygap = options::align_func_proto_gap();
-
-   log_rule_B("align_func_proto_thresh");
-   mythresh = options::align_func_proto_thresh();
-
-   // Issue #2771
-   // we align token-1 and token-2 if:
-   //   token-1->level == token-2->level
-   //   and
-   //   token-1->brace_level == token-2->brace_level
-   // we don't check if token-1 and token-2 are in the same block
-   size_t max_level_is       = 0;
-   size_t max_brace_level_is = 0;
-
-   log_rule_B("align_var_def_star_style");
-   size_t mystar_style = options::align_var_def_star_style();
-
-   log_rule_B("align_var_def_amp_style");
-   size_t       myamp_style = options::align_var_def_amp_style();
-
-   const size_t max_level_count = 8;
-   const size_t max_brace_level = 8;
-
-   AlignStack   many_as[max_level_count + 1][max_brace_level + 1];
-
-   // Issue #2771
-   AlignStack many_as_brace[max_level_count + 1][max_brace_level + 1];
-
-   log_rule_B("align_single_line_brace_gap");
-   size_t mybr_gap = options::align_single_line_brace_gap();
-
-   for (size_t idx = 0; idx <= max_level_count; idx++)
-   {
-      for (size_t idx_brace = 0; idx_brace <= max_brace_level; idx_brace++)
-      {
-         many_as[idx][idx_brace].Start(myspan, mythresh);
-         many_as[idx][idx_brace].m_gap        = mygap;
-         many_as[idx][idx_brace].m_star_style = static_cast<AlignStack::StarStyle>(mystar_style);
-         many_as[idx][idx_brace].m_amp_style  = static_cast<AlignStack::StarStyle>(myamp_style);
-
-         many_as_brace[idx][idx_brace].Start(myspan, 0);
-         many_as_brace[idx][idx_brace].m_gap = mybr_gap;
-      }
-   }
-
-   bool    look_bro = false;
-   chunk_t *toadd;
-
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
-   {
-      LOG_FMT(LAS, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, level is %zu, brace_level is %zu\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(),
-              get_token_name(pc->type), pc->level, pc->brace_level);
-
-      if (pc->level > max_level_count)                             // Issue #2960
-      {
-         fprintf(stderr, "%s(%d): pc->level is %zu. This is too big, at line %zu, column %zu. Make a report, please.\n",
-                 __func__, __LINE__, pc->level, pc->orig_line, pc->orig_col);
-         log_flush(true);
-         exit(EX_SOFTWARE);
-      }
-
-      if (pc->brace_level > max_brace_level)
-      {
-         fprintf(stderr, "%s(%d): pc->brace_level is %zu. This is too big, at line %zu, column %zu. Make a report, please.\n",
-                 __func__, __LINE__, pc->level, pc->orig_line, pc->orig_col);
-         log_flush(true);
-         exit(EX_SOFTWARE);
-      }
-
-      if (  chunk_is_newline(pc)
-         && !pc->flags.test(PCF_IN_FCN_CALL))                 // Issue #2831
-      {
-         look_bro = false;
-         many_as[pc->level][pc->brace_level].Debug();
-         many_as_brace[pc->level][pc->brace_level].Debug();
-
-         for (size_t idx = 0; idx <= max_level_count; idx++)
-         {
-            for (size_t idx_brace = 0; idx_brace <= max_brace_level; idx_brace++)
-            {
-               many_as[idx][idx_brace].NewLines(pc->nl_count);
-            }
-         }
-
-         many_as_brace[pc->level][pc->brace_level].NewLines(pc->nl_count);
-      }
-      else if (  chunk_is_token(pc, CT_FUNC_PROTO)
-              || (  chunk_is_token(pc, CT_FUNC_DEF)
-                 && options::align_single_line_func()))
-      {
-         log_rule_B("align_single_line_func");
-         log_rule_B("align_on_operator");
-
-         if (  get_chunk_parent_type(pc) == CT_OPERATOR
-            && options::align_on_operator())
-         {
-            toadd = chunk_get_prev_ncnl(pc);
-         }
-         else
-         {
-            toadd = pc;
-         }
-
-         if (pc->level > max_level_count)
-         {
-            fprintf(stderr, "%s(%d): Not enought memory for Stack\n",
-                    __func__, __LINE__);
-            fprintf(stderr, "%s(%d): the current maximum for level is %zu\n",
-                    __func__, __LINE__, max_level_count);
-            log_flush(true);
-         }
-
-         if (pc->level > max_brace_level)
-         {
-            fprintf(stderr, "%s(%d): Not enought memory for Stack\n",
-                    __func__, __LINE__);
-            fprintf(stderr, "%s(%d): the current maximum for brace_level is %zu\n",
-                    __func__, __LINE__, max_brace_level);
-            log_flush(true);
-            exit(EX_SOFTWARE);
-         }
-         chunk_t *tmp = step_back_over_member(toadd);
-         LOG_FMT(LAS, "%s(%d): tmp->text() is '%s', orig_line is %zu, orig_col is %zu, level is %zu, brace_level is %zu\n",
-                 __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col,
-                 tmp->level, tmp->brace_level);
-         max_level_is       = max(max_level_is, pc->level);
-         max_brace_level_is = max(max_brace_level_is, pc->level);
-         many_as[pc->level][pc->brace_level].Add(tmp);
-         log_rule_B("align_single_line_brace");
-         look_bro = (chunk_is_token(pc, CT_FUNC_DEF))
-                    && options::align_single_line_brace();
-      }
-      else if (  look_bro
-              && chunk_is_token(pc, CT_BRACE_OPEN)
-              && pc->flags.test(PCF_ONE_LINER))
-      {
-         many_as_brace[pc->level][pc->brace_level].Add(pc);
-         look_bro = false;
-      }
-   }
-
-   LOG_FMT(LAS, "%s(%d):  as\n", __func__, __LINE__);
-
-   for (size_t idx = 0; idx <= max_level_count; idx++)
-   {
-      for (size_t idx_brace = 0; idx_brace <= max_brace_level; idx_brace++)
-      {
-         many_as[idx][idx_brace].End();
-         many_as_brace[idx][idx_brace].End();
-      }
-   }
-} // align_func_proto
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_skip.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_skip.cpp
deleted file mode 100644
index e6a720ed..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_skip.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @file combine_skip.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#include "combine_skip.h"
-
-
-chunk_t *skip_align(chunk_t *start)
-{
-   chunk_t *pc = start;
-
-   if (chunk_is_token(pc, CT_ALIGN))
-   {
-      pc = chunk_get_next_ncnl(pc);
-
-      if (chunk_is_token(pc, CT_PAREN_OPEN))
-      {
-         pc = chunk_get_next_type(pc, CT_PAREN_CLOSE, pc->level);
-         pc = chunk_get_next_ncnl(pc);
-
-         if (chunk_is_token(pc, CT_COLON))
-         {
-            pc = chunk_get_next_ncnl(pc);
-         }
-      }
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_expression(chunk_t *start)
-{
-   chunk_t *pc = start;
-
-   while (pc != nullptr && pc->level >= start->level)
-   {
-      if (  pc->level == start->level
-         && (chunk_is_semicolon(pc) || chunk_is_token(pc, CT_COMMA)))
-      {
-         return(pc);
-      }
-      pc = chunk_get_next_ncnl(pc);
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_to_next_statement(chunk_t *pc)
-{
-   while (  pc != nullptr
-         && !chunk_is_semicolon(pc)
-         && chunk_is_not_token(pc, CT_BRACE_OPEN)
-         && chunk_is_not_token(pc, CT_BRACE_CLOSE))
-   {
-      pc = chunk_get_next_ncnl(pc);
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_parent_types(chunk_t *colon)
-{
-   auto pc = chunk_get_next_ncnlnp(colon);
-
-   while (pc)
-   {
-      // Skip access specifier
-      if (chunk_is_token(pc, CT_ACCESS))
-      {
-         pc = chunk_get_next_ncnlnp(pc);
-         continue;
-      }
-
-      // Check for a type name
-      if (!(chunk_is_token(pc, CT_WORD) || chunk_is_token(pc, CT_TYPE)))
-      {
-         LOG_FMT(LPCU,
-                 "%s is confused; expected a word at %zu:%zu "
-                 "following type list at %zu:%zu\n", __func__,
-                 colon->orig_line, colon->orig_col,
-                 pc->orig_line, pc->orig_col);
-         return(colon);
-      }
-      // Get next token
-      auto next = skip_template_next(chunk_get_next_ncnlnp(pc));
-
-      if (chunk_is_token(next, CT_DC_MEMBER) || chunk_is_token(next, CT_COMMA))
-      {
-         pc = chunk_get_next_ncnlnp(next);
-      }
-      else if (next)
-      {
-         LOG_FMT(LPCU, "%s -> %zu:%zu ('%s')\n", __func__,
-                 next->orig_line, next->orig_col, next->text());
-         return(next);
-      }
-      else
-      {
-         break;
-      }
-   }
-   LOG_FMT(LPCU, "%s: did not find end of type list (start was %zu:%zu)\n",
-           __func__, colon->orig_line, colon->orig_col);
-   return(colon);
-} // skip_parent_types
-
-
-chunk_t *skip_template_prev(chunk_t *ang_close)
-{
-   if (chunk_is_token(ang_close, CT_ANGLE_CLOSE))
-   {
-      chunk_t *pc = chunk_get_prev_type(ang_close, CT_ANGLE_OPEN, ang_close->level);
-      return(chunk_get_prev_ncnlni(pc));   // Issue #2279
-   }
-   return(ang_close);
-}
-
-
-chunk_t *skip_tsquare_next(chunk_t *ary_def)
-{
-   if (chunk_is_token(ary_def, CT_SQUARE_OPEN) || chunk_is_token(ary_def, CT_TSQUARE))
-   {
-      return(chunk_get_next_nisq(ary_def));
-   }
-   return(ary_def);
-}
-
-
-chunk_t *skip_attribute_next(chunk_t *attr)
-{
-   chunk_t *pc = attr;
-
-   while (chunk_is_token(pc, CT_ATTRIBUTE))
-   {
-      pc = chunk_get_next_ncnl(pc);
-
-      if (chunk_is_token(pc, CT_FPAREN_OPEN))
-      {
-         pc = chunk_get_next_type(pc, CT_FPAREN_CLOSE, pc->level);
-         pc = chunk_get_next_ncnl(pc);
-      }
-   }
-   return(pc);
-}
-
-
-chunk_t *skip_attribute_prev(chunk_t *fp_close)
-{
-   chunk_t *pc = fp_close;
-
-   while (true)
-   {
-      if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
-         && get_chunk_parent_type(pc) == CT_ATTRIBUTE)
-      {
-         pc = chunk_get_prev_type(pc, CT_ATTRIBUTE, pc->level);
-      }
-      else if (chunk_is_not_token(pc, CT_ATTRIBUTE))
-      {
-         break;
-      }
-      pc = chunk_get_prev_ncnlni(pc);   // Issue #2279
-   }
-   return(pc);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_skip.h b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_skip.h
deleted file mode 100644
index 31f7fca4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_skip.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @file combine_skip.h
- *
- * @author  Guy Maurel
- * @license GPL v2+
- * extract from combine.cpp
- */
-
-#ifndef COMBINE_SKIP_H_INCLUDED
-#define COMBINE_SKIP_H_INCLUDED
-
-#include "chunk_list.h"
-
-
-/**
- * Skips the D 'align()' statement and the colon, if present.
- *    align(2) int foo;  -- returns 'int'
- *    align(4):          -- returns 'int'
- *    int bar;
- */
-chunk_t *skip_align(chunk_t *start);
-
-
-/**
- * Skips everything until a comma or semicolon at the same level.
- * Returns the semicolon, comma, or close brace/paren or nullptr.
- */
-chunk_t *skip_expression(chunk_t *start);
-
-
-/**
- * Skips the list of class/struct parent types.
- */
-chunk_t *skip_parent_types(chunk_t *colon);
-
-
-/**
- * Skips over the rest of the template if ang_open is indeed a CT_ANGLE_OPEN.
- * Points to the chunk after the CT_ANGLE_CLOSE.
- * If the chunk isn't an CT_ANGLE_OPEN, then it is returned.
- */
-chunk_t *skip_template_next(chunk_t *ang_open);
-
-
-/**
- * Skips over the rest of the template if ang_close is indeed a CT_ANGLE_CLOSE.
- * Points to the chunk before the CT_ANGLE_OPEN
- * If the chunk isn't an CT_ANGLE_CLOSE, then it is returned.
- */
-chunk_t *skip_template_prev(chunk_t *ang_close);
-
-
-//! Skips to the start of the next statement.
-chunk_t *skip_to_next_statement(chunk_t *pc);
-
-
-/**
- * Skips the rest of the array definitions if ary_def is indeed a
- * CT_TSQUARE or CT_SQUARE_OPEN
- */
-chunk_t *skip_tsquare_next(chunk_t *ary_def);
-
-
-/**
- * If attr is CT_ATTRIBUTE, then skip it and the parens and return the chunk
- * after the CT_FPAREN_CLOSE.
- * If the chunk isn't an CT_ATTRIBUTE, then it is returned.
- */
-chunk_t *skip_attribute_next(chunk_t *attr);
-
-
-/**
- * If fp_close is a CT_FPAREN_CLOSE with a parent of CT_ATTRIBUTE, then skip it
- * and the '__attribute__' thingy and return the chunk before CT_ATTRIBUTE.
- * Otherwise return fp_close.
- */
-chunk_t *skip_attribute_prev(chunk_t *fp_close);
-
-
-#endif /* COMBINE_SKIP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_levels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_levels.h
deleted file mode 100644
index a120d461..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_levels.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * @file log_levels.h
- *
- * Enum for log levels.
- * Use these for the log severities in LOG_FMT(), etc.
- *
- * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
- * @license GPL v2+
- */
-#ifndef LOG_LEVELS_H_INCLUDED
-#define LOG_LEVELS_H_INCLUDED
-
-/**
- * list of available log levels
- *
- * The user defines which log level is active using the
- * -L or -log option.
- * use -L A to set all the levels
- * All messages which have a level that is active will be stored to the log
- * file.
- * All other log messages will be discarded.
- * Different parts of the software use different log levels.
- * This allows to log only operations of a specific operation.
- * This eases debugging.
- * To get all log messages use the option -La
- * By default only system messages (level=LSYS) are logged.
- */
-enum log_sev_t
-{
-   LSYS      = 0,  //! system messages
-   LERR      = 1,  //! error messages
-   LWARN     = 2,  //! warnings
-   LNOTE     = 3,  //! user notifications
-   LINFO     = 4,  //! user informations
-   LDATA     = 5,  //! data logging
-
-   LFILELIST = 8,  //! Files in the file list file
-   LLINEENDS = 9,  //! Show which line endings are used
-   LCASTS    = 10, //! align casts
-   LALBR     = 11, //! align braces
-   LALTD     = 12, //! Align Typedef
-   LALPP     = 13, //! align #define
-   LALPROTO  = 14, //! align prototype
-   LALNLC    = 15, //! align backslash-newline
-   LALTC     = 16, //! align trailing comments
-   LALADD    = 17, //! align add
-   LALASS    = 18, //! align assign
-   LFVD      = 19, //! fix_var_def
-   LFVD2     = 20, //! fix_var_def-2
-   LINDENT   = 21, //! indent_text
-   LINDENT2  = 22, //! indent_text tab level
-   LINDPSE   = 23, //! indent_text stack
-   LINDPC    = 24, //! indent play-by-play
-   LNEWLINE  = 25, //! newlines
-   LPF       = 26, //! Parse Frame
-   LSTMT     = 27, //! Marking statements/expressions
-   LTOK      = 28, //! Tokenize
-   LALRC     = 29, //! align right comment
-   LCMTIND   = 30, //! Comment Indent
-   LINDLINE  = 31, //! indent line
-   LSIB      = 32, //! Scan IB
-   LRETURN   = 33, //! add/remove parens for return
-   LBRDEL    = 34, //! brace removal
-   LFCN      = 35, //! function detection
-   LFCNP     = 36, //! function parameters
-   LPCU      = 37, //! parse cleanup
-   LDYNKW    = 38, //! dynamic keywords
-   LOUTIND   = 39, //! output indent
-   LBCSAFTER = 40, //! Brace cleanup stack - after each token
-   LBCSPOP   = 41, //! Brace cleanup stack - log pops
-   LBCSPUSH  = 42, //! Brace cleanup stack - log push
-   LBCSSWAP  = 43, //! Brace cleanup stack - log swaps
-   LFTOR     = 44, //! Class Ctor or Dtor
-   LAS       = 45, //! align_stack
-   LPPIS     = 46, //! Preprocessor Indent and Space
-   LTYPEDEF  = 47, //! Typedef and function types
-   LVARDEF   = 48, //! Variable def marking
-   LDEFVAL   = 49, //! define values
-   LPVSEMI   = 50, //! Pawn: virtual semicolons
-   LPFUNC    = 51, //! Pawn: function recognition
-   LSPLIT    = 52, //! Line splitting
-   LFTYPE    = 53, //! Function type detection
-   LTEMPL    = 54, //! Template detection
-   LPARADD   = 55, //! adding parens in if/while
-   LPARADD2  = 56, //! adding parens in if/while - details
-   LBLANKD   = 57, //! blank line details
-   LTEMPFUNC = 58, //! Template function detection
-   LSCANSEMI = 59, //! scan semicolon removal
-   LDELSEMI  = 60, //! Removing semicolons
-   LFPARAM   = 61, //! Testing for a full parameter
-   LNL1LINE  = 62, //! NL check for 1 liners
-   LPFCHK    = 63, //! Parse Frame check function call
-   LAVDB     = 64, //! align var def braces
-   LSORT     = 65, //! Sorting
-   LSPACE    = 66, //! Space
-   LALIGN    = 67, //! align
-   LALAGAIN  = 68, //! align again
-   LOPERATOR = 69, //! operator
-   LASFCP    = 70, //! Align Same Function Call Params
-   LINDLINED = 71, //! indent line details
-   LBCTRL    = 72, //! beautifier control
-   LRMRETURN = 73, //! remove 'return;'
-   LPPIF     = 74, //! #if/#else/#endif pair processing
-   LMCB      = 75, //! mod_case_brace
-   LBRCH     = 76, //! if brace chain
-   LFCNR     = 77, //! function return type
-   LOCCLASS  = 78, //! OC Class stuff
-   LOCMSG    = 79, //! OC Message stuff
-   LBLANK    = 80, //! Blank Lines
-   LOBJCWORD = 81, //! Convert keyword to CT_WORD in certain circumstances
-   LCHANGE   = 82, //! something changed
-   LCONTTEXT = 83, //! comment cont_text set
-   LANNOT    = 84, //! Java annotation
-   LOCBLK    = 85, //! OC Block stuff
-   LFLPAREN  = 86, //! Flag paren
-   LOCMSGD   = 87, //! OC Message declaration
-   LINDENTAG = 88, //! indent again
-   LNFD      = 89, //! newline-function-def
-   LJDBI     = 90, //! Java Double Brace Init
-   LSETPAR   = 91, //! set_chunk_parent()
-   LSETTYP   = 92, //! set_chunk_type()
-   LSETFLG   = 93, //! set_chunk_flags()
-   LNLFUNCT  = 94, //! newlines before function
-   LCHUNK    = 95, //! Add or delete chunk
-   LGUY98    = 98, //! for guy-test
-   LGUY      = 99, //! for guy-test
-};
-
-#endif /* LOG_LEVELS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_rules.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_rules.cpp
deleted file mode 100644
index eead7924..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_rules.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @file log_rules.cpp
- * is an extract from space.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "log_rules.h"
-#include <string.h>
-
-
-void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second)
-{
-   LOG_FUNC_ENTRY();
-
-   if (second->type != CT_NEWLINE)
-   {
-      LOG_FMT(LSPACE, "%s(%zu): first->orig_line is %zu, first->orig_col is %zu, first->text() is '%s', [%s/%s] <===>\n",
-              func, line, first->orig_line, first->orig_col, first->text(),
-              get_token_name(first->type), get_token_name(get_chunk_parent_type(first)));
-      LOG_FMT(LSPACE, "   second->orig_line is %zu, second->orig_col is %zu, second->text() '%s', [%s/%s] : rule %s[line %zu]\n",
-              second->orig_line, second->orig_col, second->text(),
-              get_token_name(second->type), get_token_name(get_chunk_parent_type(second)),
-              rule, line);
-   }
-}
-
-
-void log_rule3(const char *func, const char *rule)
-{
-   const char *where = nullptr;
-
-#ifdef WIN32
-   // some Windows provide "ABC::XYZ::function_Name" as __func__
-   // we look for the last ':' character
-   // a function rindex cannot be found
-   size_t length_of_string = strlen(func);
-
-   for (int which = length_of_string - 1; which > 0; which--)
-   {
-      char oneChar = func[which];
-
-      if (oneChar == ':')
-      {
-         where = func + which;
-         break;
-      }
-   }
-#else // not WIN32
-   where = rindex(func, ':');
-#endif /* ifdef WIN32 */
-
-   if (where == nullptr)
-   {
-      LOG_FMT(LSPACE, "log_rule(%s): rule is '%s'\n", func, rule);
-   }
-   else
-   {
-      LOG_FMT(LSPACE, "log_rule(%s): rule is '%s'\n", where + 1, rule);
-   }
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_rules.h b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_rules.h
deleted file mode 100644
index 8fa0ce17..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/log_rules.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file log_rules.h
- * prototypes for log_rules.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#ifndef LOG_RULES_H_INCLUDED
-#define LOG_RULES_H_INCLUDED
-
-#include "chunk_list.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
-
-using namespace uncrustify;
-
-
-#define log_rule(rule)                                             \
-   do { if (log_sev_on(LSPACE)) {                                  \
-           log_rule2(__func__, __LINE__, (rule), first, second); } \
-   } while (0)
-
-
-#define log_rule_B(rule)                  \
-   do { if (log_sev_on(LSPACE)) {         \
-           log_rule3(__func__, (rule)); } \
-   } while (0)
-
-
-void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second);
-
-
-void log_rule3(const char *func, const char *rule);
-
-#endif /* LOG_RULES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize.h b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize.h
deleted file mode 100644
index 4e9fb13b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file tokenize.h
- * prototypes for tokenize.c
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef TOKENIZE_H_INCLUDED
-#define TOKENIZE_H_INCLUDED
-
-#include "uncrustify_types.h"
-
-
-/**
- * @brief Parse the text into chunks
- *
- * This function parses or tokenizes the whole buffer into a list.
- * It has to do some tricks to parse preprocessors.
- *
- * If output_text() were called immediately after, two things would happen:
- *  - trailing whitespace are removed.
- *  - leading space & tabs are converted to the appropriate format.
- *
- * All the tokens are inserted before ref. If ref is NULL, they are inserted
- * at the end of the list.  Line numbers are relative to the start of the data.
- */
-void tokenize(const std::deque<int> &data, chunk_t *ref);
-
-
-#endif /* TOKENIZE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/21.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/21.txt
deleted file mode 100644
index be688e2a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/21.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-indent_text : pc->line is 1, pc->column is 1, pc->text() is 'struct, indent_column is 1
-indent_text : orig_line is 1, indent set to 1, for 'struct'
-indent_text : pc->line is 2, pc->column is 1, pc->text() is '{, indent_column is 1
-indent_text : orig_line is 2, indent set to 1, for '{'
-indent_text : pc->line is 3, pc->column is 1, pc->text() is 'TelegramIndex, indent_column is 9
-indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
-indent_text : pc->line is 4, pc->column is 1, pc->text() is 'pTelName, indent_column is 17
-indent_text : orig_line is 4, indent set to 17, for 'pTelName'
-indent_text : pc->line is 5, pc->column is 1, pc->text() is 'nTelIndex, indent_column is 17
-indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
-indent_text : pc->line is 6, pc->column is 1, pc->text() is '{, indent_column is 9
-indent_text : orig_line is 6, indent set to 9, for '{'
-indent_text : pc->line is 7, pc->column is 1, pc->text() is '}, indent_column is 9
-indent_text : orig_line is 7, indent set to 9, for '}'
-indent_text : pc->line is 9, pc->column is 1, pc->text() is '~, indent_column is 9
-indent_text : orig_line is 9, indent set to 9, for '~'
-indent_text : pc->line is 10, pc->column is 1, pc->text() is '{, indent_column is 9
-indent_text : orig_line is 10, indent set to 9, for '{'
-indent_text : pc->line is 11, pc->column is 1, pc->text() is '}, indent_column is 9
-indent_text : orig_line is 11, indent set to 9, for '}'
-indent_text : pc->line is 13, pc->column is 1, pc->text() is 'const, indent_column is 9
-indent_text : orig_line is 13, indent set to 9, for 'const'
-indent_text : pc->line is 14, pc->column is 1, pc->text() is 'unsigned, indent_column is 9
-indent_text : orig_line is 14, indent set to 9, for 'unsigned'
-indent_text : pc->line is 15, pc->column is 1, pc->text() is '}, indent_column is 1
-indent_text : orig_line is 15, indent set to 1, for '}'
-indent_text : pc->line is 1, pc->column is 1, pc->text() is 'struct, indent_column is 1
-indent_text : orig_line is 1, indent set to 1, for 'struct'
-indent_text : pc->line is 2, pc->column is 1, pc->text() is '{, indent_column is 1
-indent_text : orig_line is 2, indent set to 1, for '{'
-indent_text : pc->line is 3, pc->column is 9, pc->text() is 'TelegramIndex, indent_column is 9
-indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
-indent_text : pc->line is 4, pc->column is 17, pc->text() is 'pTelName, indent_column is 17
-indent_text : orig_line is 4, indent set to 17, for 'pTelName'
-indent_text : pc->line is 5, pc->column is 17, pc->text() is 'nTelIndex, indent_column is 17
-indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
-indent_text : pc->line is 6, pc->column is 9, pc->text() is '{, indent_column is 9
-indent_text : orig_line is 6, indent set to 9, for '{'
-indent_text : pc->line is 7, pc->column is 9, pc->text() is '}, indent_column is 9
-indent_text : orig_line is 7, indent set to 9, for '}'
-indent_text : pc->line is 9, pc->column is 9, pc->text() is '~, indent_column is 9
-indent_text : orig_line is 9, indent set to 9, for '~'
-indent_text : pc->line is 10, pc->column is 9, pc->text() is '{, indent_column is 9
-indent_text : orig_line is 10, indent set to 9, for '{'
-indent_text : pc->line is 11, pc->column is 9, pc->text() is '}, indent_column is 9
-indent_text : orig_line is 11, indent set to 9, for '}'
-indent_text : pc->line is 13, pc->column is 9, pc->text() is 'const, indent_column is 9
-indent_text : orig_line is 13, indent set to 9, for 'const'
-indent_text : pc->line is 14, pc->column is 9, pc->text() is 'unsigned, indent_column is 9
-indent_text : orig_line is 14, indent set to 9, for 'unsigned'
-indent_text : pc->line is 15, pc->column is 1, pc->text() is '}, indent_column is 1
-indent_text : orig_line is 15, indent set to 1, for '}'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/25.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/25.txt
deleted file mode 100644
index 08028740..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/25.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Newline loop start: 0
-newline_add_between : start->text() is ';', type is SEMICOLON, orig_line is 14, orig_col is 24
-newline_add_between : and end->text() is '}', orig_line is 15, orig_col is 1
-   [CallStack]
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 7, orig_col is 1
-   [CallStack]
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 7, orig_col is 1
-   [CallStack]
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 11, orig_col is 1
-   [CallStack]
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 11, orig_col is 1
-   [CallStack]
-newlines_functions_remove_extra_blank_lines : nl_max_blank_in_func is zero
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/66.txt
deleted file mode 100644
index bc6d2947..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/66.txt
+++ /dev/null
@@ -1,3114 +0,0 @@
-log_rule(main): rule is 'nl_max'
-log_rule(load_header_files): rule is 'cmt_insert_file_header'
-log_rule(load_header_files): rule is 'cmt_insert_file_footer'
-log_rule(load_header_files): rule is 'cmt_insert_func_header'
-log_rule(load_header_files): rule is 'cmt_insert_class_header'
-log_rule(load_header_files): rule is 'cmt_insert_oc_msg_header'
-log_rule(uncrustify_file): rule is 'utf8_force'
-log_rule(uncrustify_file): rule is 'utf8_byte'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(find_punctuator): rule is 'enable_digraphs'
-log_rule(parse_next): rule is 'disable_processing_nl_cont'
-log_rule(tokenize): rule is 'newlines'
-log_rule(enum_cleanup): rule is 'mod_enum_last_comma'
-log_rule(do_braces): rule is 'mod_full_brace_if_chain'
-log_rule(do_braces): rule is 'mod_full_brace_if_chain_only'
-log_rule(do_braces): rule is 'mod_full_brace_if'
-log_rule(do_braces): rule is 'mod_full_brace_do'
-log_rule(do_braces): rule is 'mod_full_brace_for'
-log_rule(do_braces): rule is 'mod_full_brace_using'
-log_rule(do_braces): rule is 'mod_full_brace_while'
-log_rule(do_braces): rule is 'mod_full_brace_if'
-log_rule(do_braces): rule is 'mod_full_brace_do'
-log_rule(do_braces): rule is 'mod_full_brace_for'
-log_rule(do_braces): rule is 'mod_full_brace_function'
-log_rule(do_braces): rule is 'mod_full_brace_using'
-log_rule(do_braces): rule is 'mod_full_brace_while'
-log_rule(do_braces): rule is 'mod_case_brace'
-log_rule(do_braces): rule is 'mod_move_case_break'
-log_rule(uncrustify_file): rule is 'mod_remove_extra_semicolon'
-log_rule(uncrustify_file): rule is 'mod_remove_empty_return'
-log_rule(do_parens): rule is 'mod_full_paren_if_bool'
-log_rule(uncrustify_file): rule is 'nl_remove_extra_newlines'
-log_rule(newlines_cleanup_braces): rule is 'nl_struct_brace'
-log_rule(newlines_struct_union): rule is 'nl_define_macro'
-log_rule(newlines_cleanup_braces): rule is 'nl_ds_struct_enum_cmt'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_open'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_brace_pair): rule is 'nl_define_macro'
-log_rule(newlines_brace_pair): rule is 'nl_create_func_def_one_liner'
-log_rule(collapse_empty_body): rule is 'nl_collapse_empty_body'
-log_rule(newlines_brace_pair): rule is 'eat_blanks_after_open_brace'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_start'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_before_opening_brace_func_class_def'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_open'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_brace_pair): rule is 'nl_define_macro'
-log_rule(newlines_brace_pair): rule is 'nl_create_func_def_one_liner'
-log_rule(newlines_brace_pair): rule is 'nl_fdef_brace_cond'
-log_rule(newlines_brace_pair): rule is 'nl_fdef_brace'
-log_rule(collapse_empty_body): rule is 'nl_collapse_empty_body'
-log_rule(newlines_brace_pair): rule is 'eat_blanks_after_open_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_square'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_fparen'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_cleanup_braces): rule is 'eat_blanks_before_close_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_struct_var'
-log_rule(newlines_cleanup_braces): rule is 'nl_after_brace_close'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_start_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_args_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_single'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_end_multi_line'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_decl_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_type_name_class'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_class_scope'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_scope_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_proto_type_name'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_def_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_paren_empty'
-log_rule(newlines_cleanup_braces): rule is 'nl_func_call_args'
-log_rule(newlines_cleanup_braces): rule is 'nl_before_opening_brace_func_class_def'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_open'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_brace_pair): rule is 'nl_define_macro'
-log_rule(newlines_brace_pair): rule is 'nl_create_func_def_one_liner'
-log_rule(newlines_brace_pair): rule is 'nl_fdef_brace_cond'
-log_rule(newlines_brace_pair): rule is 'nl_fdef_brace'
-log_rule(collapse_empty_body): rule is 'nl_collapse_empty_body'
-log_rule(newlines_brace_pair): rule is 'eat_blanks_after_open_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_square'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_fparen'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_cleanup_braces): rule is 'eat_blanks_before_close_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_struct_var'
-log_rule(newlines_cleanup_braces): rule is 'nl_after_brace_close'
-log_rule(newlines_cleanup_braces): rule is 'nl_after_semicolon'
-log_rule(newlines_cleanup_braces): rule is 'nl_after_semicolon'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_square'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_fparen'
-log_rule(newlines_cleanup_braces): rule is 'nl_type_brace_init_lst_close'
-log_rule(newlines_cleanup_braces): rule is 'eat_blanks_before_close_brace'
-log_rule(newlines_cleanup_braces): rule is 'nl_brace_struct_var'
-log_rule(newlines_cleanup_braces): rule is 'nl_after_semicolon'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_end'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_start'
-log_rule(newline_def_blk): rule is 'nl_var_def_blk_start'
-log_rule(uncrustify_file): rule is 'nl_after_multiline_comment'
-log_rule(uncrustify_file): rule is 'nl_after_label_colon'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_class_def'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_class_proto'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_body_def'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_body_proto'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_class_def'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_class_proto'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_body_def'
-log_rule(newlines_func_pre_blank_lines): rule is 'nl_before_func_body_proto'
-log_rule(uncrustify_file): rule is 'pos_bool'
-log_rule(uncrustify_file): rule is 'pos_compare'
-log_rule(uncrustify_file): rule is 'pos_conditional'
-log_rule(uncrustify_file): rule is 'pos_comma'
-log_rule(uncrustify_file): rule is 'pos_enum_comma'
-log_rule(uncrustify_file): rule is 'pos_assign'
-log_rule(uncrustify_file): rule is 'pos_arith'
-log_rule(uncrustify_file): rule is 'pos_shift'
-log_rule(newlines_class_colon_pos): rule is 'pos_class_colon'
-log_rule(newlines_class_colon_pos): rule is 'nl_class_colon'
-log_rule(newlines_class_colon_pos): rule is 'nl_class_init_args'
-log_rule(newlines_class_colon_pos): rule is 'pos_class_comma'
-log_rule(newlines_class_colon_pos): rule is 'align_constr_value_span'
-log_rule(newlines_class_colon_pos): rule is 'pos_constr_colon'
-log_rule(newlines_class_colon_pos): rule is 'nl_constr_colon'
-log_rule(newlines_class_colon_pos): rule is 'nl_constr_init_args'
-log_rule(newlines_class_colon_pos): rule is 'pos_constr_comma'
-log_rule(newlines_class_colon_pos): rule is 'align_constr_value_span'
-log_rule(uncrustify_file): rule is 'nl_squeeze_ifdef'
-log_rule(uncrustify_file): rule is 'nl_squeeze_paren_close'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(can_increase_nl): rule is 'nl_start_of_file'
-log_rule(can_increase_nl): rule is 'nl_end_of_file'
-log_rule(do_blank_lines): rule is 'nl_after_class'
-log_rule(do_blank_lines): rule is 'nl_after_struct'
-log_rule(newlines_functions_remove_extra_blank_lines): rule is 'nl_max_blank_in_func'
-log_rule(uncrustify_file): rule is 'sp_balance_nested_parens'
-log_rule(uncrustify_file): rule is 'mod_pawn_semicolon'
-log_rule(uncrustify_file): rule is 'mod_sort_import'
-log_rule(uncrustify_file): rule is 'mod_sort_include'
-log_rule(uncrustify_file): rule is 'mod_sort_using'
-space_text : orig_line is 1, orig_col is 1, 'struct' type is STRUCT
-space_text : back-to-back words need a space: pc->text() 'struct', next->text() 'TelegramIndex'
-space_text : orig_line is 1, orig_col is 1, pc-text() 'struct', type is STRUCT
-do_space : orig_line is 1, orig_col is 1, first->text() 'struct', type is STRUCT
-do_space : first->orig_line is 1, first->orig_col is 1, first->text() is 'struct', [STRUCT/NONE] <===>
-   second->orig_line is 1, second->orig_col is 8, second->text() 'TelegramIndex', [TYPE/STRUCT] : rule ADD[ ]
- <force between 'struct' and 'TelegramIndex'> rule = ADD @ 1 => 8
-space_text : orig_line is 1, orig_col is 8, 'TelegramIndex' type is TYPE
-space_text : orig_line is 1, orig_col is 8, pc-text() 'TelegramIndex', type is TYPE
-do_space : orig_line is 1, orig_col is 8, first->text() 'TelegramIndex', type is TYPE
- rule = REMOVE @ 0 => 21
-space_text : orig_line is 1, orig_col is 21, <Newline>, nl is 1
-space_text : orig_line is 2, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 2, orig_col is 1, pc-text() '{', type is BRACE_OPEN
-do_space : orig_line is 2, orig_col is 1, first->text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 2, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 3, orig_col is 1, 'TelegramIndex' type is FUNC_CLASS_DEF
-space_text : orig_line is 3, orig_col is 1, pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : orig_line is 3, orig_col is 1, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 3, first->orig_col is 1, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
-   second->orig_line is 3, second->orig_col is 14, second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
- rule = IGNORE @ 0 => 14
-space_text : orig_line is 3, orig_col is 14, '(' type is FPAREN_OPEN
-space_text : orig_line is 3, orig_col is 14, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 3, orig_col is 14, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 3, first->orig_col is 14, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-   second->orig_line is 3, second->orig_col is 15, second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 15
-space_text : orig_line is 3, orig_col is 15, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->text() 'const', next->text() 'char'
-space_text : orig_line is 3, orig_col is 15, pc-text() 'const', type is QUALIFIER
-do_space : orig_line is 3, orig_col is 15, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 3, first->orig_col is 15, first->text() is 'const', [QUALIFIER/NONE] <===>
-   second->orig_line is 3, second->orig_col is 21, second->text() 'char', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'const' and 'char'> rule = FORCE @ 1 => 21
-space_text : orig_line is 3, orig_col is 21, 'char' type is TYPE
-space_text : orig_line is 3, orig_col is 21, pc-text() 'char', type is TYPE
-do_space : orig_line is 3, orig_col is 21, first->text() 'char', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 21, first->text() is 'char', [TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 25, second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 0 => 25
-space_text : orig_line is 3, orig_col is 25, '*' type is PTR_TYPE
-space_text : orig_line is 3, orig_col is 25, pc-text() '*', type is PTR_TYPE
-do_space : orig_line is 3, orig_col is 25, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 3, first->orig_col is 25, first->text() is '*', [PTR_TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 27, second->text() 'pN', [WORD/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 1 => 27
-space_text : orig_line is 3, orig_col is 27, 'pN' type is WORD
-space_text : orig_line is 3, orig_col is 27, pc-text() 'pN', type is WORD
-do_space : orig_line is 3, orig_col is 27, first->text() 'pN', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 27, first->text() is 'pN', [WORD/NONE] <===>
-   second->orig_line is 3, second->orig_col is 29, second->text() ',', [COMMA/NONE] : rule sp_before_comma[ ]
- rule = REMOVE @ 0 => 29
-space_text : orig_line is 3, orig_col is 29, ',' type is COMMA
-space_text : orig_line is 3, orig_col is 29, pc-text() ',', type is COMMA
-do_space : orig_line is 3, orig_col is 29, first->text() ',', type is COMMA
-do_space : first->orig_line is 3, first->orig_col is 29, first->text() is ',', [COMMA/NONE] <===>
-   second->orig_line is 3, second->orig_col is 31, second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
- rule = IGNORE @ 1 => 31
-space_text : orig_line is 3, orig_col is 31, 'unsigned' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'unsigned', next->text() 'long'
-space_text : orig_line is 3, orig_col is 31, pc-text() 'unsigned', type is TYPE
-do_space : orig_line is 3, orig_col is 31, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 31, first->text() is 'unsigned', [TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 40, second->text() 'long', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 40
-space_text : orig_line is 3, orig_col is 40, 'long' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'long', next->text() 'nI'
-space_text : orig_line is 3, orig_col is 40, pc-text() 'long', type is TYPE
-do_space : orig_line is 3, orig_col is 40, first->text() 'long', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 40, first->text() is 'long', [TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 45, second->text() 'nI', [WORD/NONE] : rule sp_after_type[ ]
- <force between 'long' and 'nI'> rule = FORCE @ 1 => 45
-space_text : orig_line is 3, orig_col is 45, 'nI' type is WORD
-space_text : orig_line is 3, orig_col is 45, pc-text() 'nI', type is WORD
-do_space : orig_line is 3, orig_col is 45, first->text() 'nI', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 45, first->text() is 'nI', [WORD/NONE] <===>
-   second->orig_line is 3, second->orig_col is 47, second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 47
-space_text : orig_line is 3, orig_col is 47, ')' type is FPAREN_CLOSE
-log_rule(find_punctuator): rule is 'enable_digraphs'
-space_text : orig_line is 3, orig_col is 47, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 3, orig_col is 47, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 3, first->orig_col is 47, first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
-   second->orig_line is 3, second->orig_col is 49, second->text() ':', [CONSTR_COLON/NONE] : rule ADD[ ]
- rule = ADD @ 1 => 49
-space_text : orig_line is 3, orig_col is 49, ':' type is CONSTR_COLON
-space_text : orig_line is 3, orig_col is 49, pc-text() ':', type is CONSTR_COLON
-do_space : orig_line is 3, orig_col is 49, first->text() ':', type is CONSTR_COLON
- rule = REMOVE @ 0 => 50
-space_text : orig_line is 3, orig_col is 50, <Newline>, nl is 1
-space_text : orig_line is 4, orig_col is 1, 'pTelName' type is FUNC_CTOR_VAR
-space_text : orig_line is 4, orig_col is 1, pc-text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : orig_line is 4, orig_col is 1, first->text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 4, first->orig_col is 1, first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
-   second->orig_line is 4, second->orig_col is 9, second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
- rule = IGNORE @ 0 => 9
-space_text : orig_line is 4, orig_col is 9, '(' type is FPAREN_OPEN
-space_text : orig_line is 4, orig_col is 9, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 4, orig_col is 9, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 4, first->orig_col is 9, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-   second->orig_line is 4, second->orig_col is 10, second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 10
-space_text : orig_line is 4, orig_col is 10, 'pN' type is WORD
-space_text : orig_line is 4, orig_col is 10, pc-text() 'pN', type is WORD
-do_space : orig_line is 4, orig_col is 10, first->text() 'pN', type is WORD
-do_space : first->orig_line is 4, first->orig_col is 10, first->text() is 'pN', [WORD/NONE] <===>
-   second->orig_line is 4, second->orig_col is 12, second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 12
-space_text : orig_line is 4, orig_col is 12, ')' type is FPAREN_CLOSE
-log_rule(find_punctuator): rule is 'enable_digraphs'
-space_text : orig_line is 4, orig_col is 12, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 4, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 4, first->orig_col is 12, first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
-   second->orig_line is 4, second->orig_col is 13, second->text() ',', [COMMA/NONE] : rule sp_before_comma[ ]
- rule = REMOVE @ 0 => 13
-space_text : orig_line is 4, orig_col is 13, ',' type is COMMA
-space_text : orig_line is 4, orig_col is 13, pc-text() ',', type is COMMA
-do_space : orig_line is 4, orig_col is 13, first->text() ',', type is COMMA
- rule = REMOVE @ 0 => 14
-space_text : orig_line is 4, orig_col is 14, <Newline>, nl is 1
-space_text : orig_line is 5, orig_col is 1, 'nTelIndex' type is FUNC_CTOR_VAR
-space_text : orig_line is 5, orig_col is 1, pc-text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : orig_line is 5, orig_col is 1, first->text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 5, first->orig_col is 1, first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
-   second->orig_line is 5, second->orig_col is 10, second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
- rule = IGNORE @ 0 => 10
-space_text : orig_line is 5, orig_col is 10, '(' type is FPAREN_OPEN
-space_text : orig_line is 5, orig_col is 10, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 5, orig_col is 10, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 5, first->orig_col is 10, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-   second->orig_line is 5, second->orig_col is 11, second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 11
-space_text : orig_line is 5, orig_col is 11, 'n' type is WORD
-space_text : orig_line is 5, orig_col is 11, pc-text() 'n', type is WORD
-do_space : orig_line is 5, orig_col is 11, first->text() 'n', type is WORD
-do_space : first->orig_line is 5, first->orig_col is 11, first->text() is 'n', [WORD/NONE] <===>
-   second->orig_line is 5, second->orig_col is 12, second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
- rule = IGNORE @ 0 => 12
-space_text : orig_line is 5, orig_col is 12, ')' type is FPAREN_CLOSE
-space_text : orig_line is 5, orig_col is 12, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 5, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
- rule = REMOVE @ 0 => 13
-space_text : orig_line is 5, orig_col is 13, <Newline>, nl is 1
-space_text : orig_line is 6, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 6, orig_col is 1, pc-text() '{', type is BRACE_OPEN
-do_space : orig_line is 6, orig_col is 1, first->text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 6, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 7, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 7, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
-do_space : orig_line is 7, orig_col is 1, first->text() '}', type is BRACE_CLOSE
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 7, orig_col is 2, <Newline>, nl is 2
-space_text : orig_line is 9, orig_col is 1, '~' type is DESTRUCTOR
-space_text : orig_line is 9, orig_col is 1, pc-text() '~', type is DESTRUCTOR
-do_space : orig_line is 9, orig_col is 1, first->text() '~', type is DESTRUCTOR
-do_space : first->orig_line is 9, first->orig_col is 1, first->text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
-   second->orig_line is 9, second->orig_col is 2, second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 9, orig_col is 2, 'TelegramIndex' type is FUNC_CLASS_DEF
-space_text : orig_line is 9, orig_col is 2, pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : orig_line is 9, orig_col is 2, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 9, first->orig_col is 2, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
-   second->orig_line is 9, second->orig_col is 15, second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
- rule = IGNORE @ 0 => 15
-space_text : orig_line is 9, orig_col is 15, '(' type is FPAREN_OPEN
-log_rule(find_punctuator): rule is 'enable_digraphs'
-space_text : orig_line is 9, orig_col is 15, pc-text() '(', type is FPAREN_OPEN
-do_space : orig_line is 9, orig_col is 15, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 9, first->orig_col is 15, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-   second->orig_line is 9, second->orig_col is 16, second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
- rule = IGNORE @ 0 => 16
-space_text : orig_line is 9, orig_col is 16, ')' type is FPAREN_CLOSE
-space_text : orig_line is 9, orig_col is 16, pc-text() ')', type is FPAREN_CLOSE
-do_space : orig_line is 9, orig_col is 16, first->text() ')', type is FPAREN_CLOSE
- rule = REMOVE @ 0 => 17
-space_text : orig_line is 9, orig_col is 17, <Newline>, nl is 1
-space_text : orig_line is 10, orig_col is 1, '{' type is BRACE_OPEN
-space_text : orig_line is 10, orig_col is 1, pc-text() '{', type is BRACE_OPEN
-do_space : orig_line is 10, orig_col is 1, first->text() '{', type is BRACE_OPEN
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 10, orig_col is 2, <Newline>, nl is 1
-space_text : orig_line is 11, orig_col is 1, '}' type is BRACE_CLOSE
-space_text : orig_line is 11, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
-do_space : orig_line is 11, orig_col is 1, first->text() '}', type is BRACE_CLOSE
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 11, orig_col is 2, <Newline>, nl is 2
-space_text : orig_line is 13, orig_col is 1, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->text() 'const', next->text() 'char'
-space_text : orig_line is 13, orig_col is 1, pc-text() 'const', type is QUALIFIER
-do_space : orig_line is 13, orig_col is 1, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 1, first->text() is 'const', [QUALIFIER/NONE] <===>
-   second->orig_line is 13, second->orig_col is 7, second->text() 'char', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'const' and 'char'> rule = FORCE @ 1 => 7
-space_text : orig_line is 13, orig_col is 7, 'char' type is TYPE
-space_text : orig_line is 13, orig_col is 7, pc-text() 'char', type is TYPE
-do_space : orig_line is 13, orig_col is 7, first->text() 'char', type is TYPE
-do_space : first->orig_line is 13, first->orig_col is 7, first->text() is 'char', [TYPE/NONE] <===>
-   second->orig_line is 13, second->orig_col is 11, second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 0 => 11
-space_text : orig_line is 13, orig_col is 11, '*' type is PTR_TYPE
-space_text : orig_line is 13, orig_col is 11, pc-text() '*', type is PTR_TYPE
-do_space : orig_line is 13, orig_col is 11, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 13, first->orig_col is 11, first->text() is '*', [PTR_TYPE/NONE] <===>
-   second->orig_line is 13, second->orig_col is 13, second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[ ]
- rule = IGNORE @ 1 => 13
-space_text : orig_line is 13, orig_col is 13, 'const' type is QUALIFIER
-space_text : back-to-back words need a space: pc->text() 'const', next->text() 'pTelName'
-space_text : orig_line is 13, orig_col is 13, pc-text() 'const', type is QUALIFIER
-do_space : orig_line is 13, orig_col is 13, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 13, first->text() is 'const', [QUALIFIER/NONE] <===>
-   second->orig_line is 13, second->orig_col is 19, second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
- <force between 'const' and 'pTelName'> rule = FORCE @ 1 => 19
-space_text : orig_line is 13, orig_col is 19, 'pTelName' type is WORD
-space_text : orig_line is 13, orig_col is 19, pc-text() 'pTelName', type is WORD
-do_space : orig_line is 13, orig_col is 19, first->text() 'pTelName', type is WORD
-do_space : first->orig_line is 13, first->orig_col is 19, first->text() is 'pTelName', [WORD/NONE] <===>
-   second->orig_line is 13, second->orig_col is 27, second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 27
-space_text : orig_line is 13, orig_col is 27, ';' type is SEMICOLON
-space_text : orig_line is 13, orig_col is 27, pc-text() ';', type is SEMICOLON
-do_space : orig_line is 13, orig_col is 27, first->text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 28
-space_text : orig_line is 13, orig_col is 28, <Newline>, nl is 1
-space_text : orig_line is 14, orig_col is 1, 'unsigned' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'unsigned', next->text() 'long'
-space_text : orig_line is 14, orig_col is 1, pc-text() 'unsigned', type is TYPE
-do_space : orig_line is 14, orig_col is 1, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 1, first->text() is 'unsigned', [TYPE/NONE] <===>
-   second->orig_line is 14, second->orig_col is 10, second->text() 'long', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 10
-space_text : orig_line is 14, orig_col is 10, 'long' type is TYPE
-space_text : back-to-back words need a space: pc->text() 'long', next->text() 'nTelIndex'
-space_text : orig_line is 14, orig_col is 10, pc-text() 'long', type is TYPE
-do_space : orig_line is 14, orig_col is 10, first->text() 'long', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 10, first->text() is 'long', [TYPE/NONE] <===>
-   second->orig_line is 14, second->orig_col is 15, second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
- <force between 'long' and 'nTelIndex'> rule = FORCE @ 1 => 15
-space_text : orig_line is 14, orig_col is 15, 'nTelIndex' type is WORD
-space_text : orig_line is 14, orig_col is 15, pc-text() 'nTelIndex', type is WORD
-do_space : orig_line is 14, orig_col is 15, first->text() 'nTelIndex', type is WORD
-do_space : first->orig_line is 14, first->orig_col is 15, first->text() is 'nTelIndex', [WORD/NONE] <===>
-   second->orig_line is 14, second->orig_col is 24, second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 24
-space_text : orig_line is 14, orig_col is 24, ';' type is SEMICOLON
-space_text : orig_line is 14, orig_col is 24, pc-text() ';', type is SEMICOLON
-do_space : orig_line is 14, orig_col is 24, first->text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 25
-space_text : orig_line is 14, orig_col is 25, <Newline>, nl is 1
-space_text : orig_line is 15, orig_col is 1, '}' type is BRACE_CLOSE
-log_rule(find_punctuator): rule is 'enable_digraphs'
-space_text : orig_line is 15, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
-do_space : orig_line is 15, orig_col is 1, first->text() '}', type is BRACE_CLOSE
-do_space : first->orig_line is 15, first->orig_col is 1, first->text() is '}', [BRACE_CLOSE/STRUCT] <===>
-   second->orig_line is 15, second->orig_col is 2, second->text() ';', [SEMICOLON/STRUCT] : rule sp_before_semi[ ]
- rule = REMOVE @ 0 => 2
-space_text : orig_line is 15, orig_col is 2, ';' type is SEMICOLON
-space_text : orig_line is 15, orig_col is 2, pc-text() ';', type is SEMICOLON
-do_space : orig_line is 15, orig_col is 2, first->text() ';', type is SEMICOLON
- rule = REMOVE @ 0 => 3
-space_text : orig_line is 15, orig_col is 3, <Newline>, nl is 2
-log_rule(uncrustify_file): rule is 'align_pp_define_span'
-log_rule(indent_text): rule is 'indent_columns'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_macro_brace'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 3, orig_col is 1, [FUNC_CLASS_DEF/NONE], text() 'TelegramIndex' <==>
-space_col_align : second->orig_line is 3, orig_col is 14 [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(', [CallStack]
-do_space : orig_line is 3, orig_col is 1, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 3, first->orig_col is 1, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
-   second->orig_line is 3, second->orig_col is 14, second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 13
-space_col_align :    => coldiff is 13
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'TelegramIndex'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 14
-space_col_align :    => first->len()      is 13
-space_col_align :    => coldiff is 13
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 14, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
-space_col_align : second->orig_line is 3, orig_col is 15 [QUALIFIER/NONE], text() 'const', [CallStack]
-do_space : orig_line is 3, orig_col is 14, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 3, first->orig_col is 14, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-   second->orig_line is 3, second->orig_col is 15, second->text() 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'const'
-space_col_align :    => first->orig_col   is 14
-space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 15, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 3, orig_col is 21 [TYPE/NONE], text() 'char', [CallStack]
-do_space : orig_line is 3, orig_col is 15, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 3, first->orig_col is 15, first->text() is 'const', [QUALIFIER/NONE] <===>
-   second->orig_line is 3, second->orig_col is 21, second->text() 'char', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'const' and 'char'>space_col_align : av is force
-space_col_align :    len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 21, [TYPE/NONE], text() 'char' <==>
-space_col_align : second->orig_line is 3, orig_col is 25 [PTR_TYPE/NONE], text() '*', [CallStack]
-do_space : orig_line is 3, orig_col is 21, first->text() 'char', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 21, first->text() is 'char', [TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 25, second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'char'
-space_col_align :    => second->text()    is '*'
-space_col_align :    => first->orig_col   is 21
-space_col_align :    => second->orig_col  is 25
-space_col_align :    => first->len()      is 4
-space_col_align :    => coldiff is 4
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 25, [PTR_TYPE/NONE], text() '*' <==>
-space_col_align : second->orig_line is 3, orig_col is 27 [WORD/NONE], text() 'pN', [CallStack]
-do_space : orig_line is 3, orig_col is 25, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 3, first->orig_col is 25, first->text() is '*', [PTR_TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 27, second->text() 'pN', [WORD/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is '*'
-space_col_align :    => second->text()    is 'pN'
-space_col_align :    => first->orig_col   is 25
-space_col_align :    => second->orig_col  is 27
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 2
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 27, [WORD/NONE], text() 'pN' <==>
-space_col_align : second->orig_line is 3, orig_col is 29 [COMMA/NONE], text() ',', [CallStack]
-do_space : orig_line is 3, orig_col is 27, first->text() 'pN', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 27, first->text() is 'pN', [WORD/NONE] <===>
-   second->orig_line is 3, second->orig_col is 29, second->text() ',', [COMMA/NONE] : rule sp_before_comma[ ]
-space_col_align : av is remove
-space_col_align :    len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 2
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 29, [COMMA/NONE], text() ',' <==>
-space_col_align : second->orig_line is 3, orig_col is 31 [TYPE/NONE], text() 'unsigned', [CallStack]
-do_space : orig_line is 3, orig_col is 29, first->text() ',', type is COMMA
-do_space : first->orig_line is 3, first->orig_col is 29, first->text() is ',', [COMMA/NONE] <===>
-   second->orig_line is 3, second->orig_col is 31, second->text() 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is ','
-space_col_align :    => second->text()    is 'unsigned'
-space_col_align :    => first->orig_col   is 29
-space_col_align :    => second->orig_col  is 31
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 2
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 31, [TYPE/NONE], text() 'unsigned' <==>
-space_col_align : second->orig_line is 3, orig_col is 40 [TYPE/NONE], text() 'long', [CallStack]
-do_space : orig_line is 3, orig_col is 31, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 31, first->text() is 'unsigned', [TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 40, second->text() 'long', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'unsigned' and 'long'>space_col_align : av is force
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 9
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 40, [TYPE/NONE], text() 'long' <==>
-space_col_align : second->orig_line is 3, orig_col is 45 [WORD/NONE], text() 'nI', [CallStack]
-do_space : orig_line is 3, orig_col is 40, first->text() 'long', type is TYPE
-do_space : first->orig_line is 3, first->orig_col is 40, first->text() is 'long', [TYPE/NONE] <===>
-   second->orig_line is 3, second->orig_col is 45, second->text() 'nI', [WORD/NONE] : rule sp_after_type[ ]
- <force between 'long' and 'nI'>space_col_align : av is force
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 5
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 45, [WORD/NONE], text() 'nI' <==>
-space_col_align : second->orig_line is 3, orig_col is 47 [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')', [CallStack]
-do_space : orig_line is 3, orig_col is 45, first->text() 'nI', type is WORD
-do_space : first->orig_line is 3, first->orig_col is 45, first->text() is 'nI', [WORD/NONE] <===>
-   second->orig_line is 3, second->orig_col is 47, second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 3
-space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'nI'
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 45
-space_col_align :    => second->orig_col  is 47
-space_col_align :    => first->len()      is 2
-space_col_align :    => coldiff is 2
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
-space_col_align : second->orig_line is 3, orig_col is 49 [CONSTR_COLON/NONE], text() ':', [CallStack]
-do_space : orig_line is 3, orig_col is 47, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 3, first->orig_col is 47, first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
-   second->orig_line is 3, second->orig_col is 49, second->text() ':', [CONSTR_COLON/NONE] : rule ADD[ ]
-space_col_align : av is add
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is ADD
-space_col_align :    => coldiff is 2
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 3, orig_col is 49, [CONSTR_COLON/NONE], text() ':' <==>
-space_col_align : second->orig_line is 3, orig_col is 50 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 3, orig_col is 49, first->text() ':', type is CONSTR_COLON
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_class_colon'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 4, orig_col is 1, [FUNC_CTOR_VAR/NONE], text() 'pTelName' <==>
-space_col_align : second->orig_line is 4, orig_col is 9 [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(', [CallStack]
-do_space : orig_line is 4, orig_col is 1, first->text() 'pTelName', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 4, first->orig_col is 1, first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
-   second->orig_line is 4, second->orig_col is 9, second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is 'pTelName'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 9
-space_col_align :    => first->len()      is 8
-space_col_align :    => coldiff is 8
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 4, orig_col is 9, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
-space_col_align : second->orig_line is 4, orig_col is 10 [WORD/NONE], text() 'pN', [CallStack]
-do_space : orig_line is 4, orig_col is 9, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 4, first->orig_col is 9, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-   second->orig_line is 4, second->orig_col is 10, second->text() 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'pN'
-space_col_align :    => first->orig_col   is 9
-space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 4, orig_col is 10, [WORD/NONE], text() 'pN' <==>
-space_col_align : second->orig_line is 4, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
-do_space : orig_line is 4, orig_col is 10, first->text() 'pN', type is WORD
-do_space : first->orig_line is 4, first->orig_col is 10, first->text() is 'pN', [WORD/NONE] <===>
-   second->orig_line is 4, second->orig_col is 12, second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 2
-space_col_align :    => coldiff is 2
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 4
-space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is 'pN'
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 10
-space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->len()      is 2
-space_col_align :    => coldiff is 2
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 4, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
-space_col_align : second->orig_line is 4, orig_col is 13 [COMMA/NONE], text() ',', [CallStack]
-do_space : orig_line is 4, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
-do_space : first->orig_line is 4, first->orig_col is 12, first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
-   second->orig_line is 4, second->orig_col is 13, second->text() ',', [COMMA/NONE] : rule sp_before_comma[ ]
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 4, orig_col is 13, [COMMA/NONE], text() ',' <==>
-space_col_align : second->orig_line is 4, orig_col is 14 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 4, orig_col is 13, first->text() ',', type is COMMA
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 5, orig_col is 1, [FUNC_CTOR_VAR/NONE], text() 'nTelIndex' <==>
-space_col_align : second->orig_line is 5, orig_col is 10 [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(', [CallStack]
-do_space : orig_line is 5, orig_col is 1, first->text() 'nTelIndex', type is FUNC_CTOR_VAR
-do_space : first->orig_line is 5, first->orig_col is 1, first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
-   second->orig_line is 5, second->orig_col is 10, second->text() '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 9
-space_col_align :    => coldiff is 9
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is 'nTelIndex'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 1
-space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->len()      is 9
-space_col_align :    => coldiff is 9
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 5, orig_col is 10, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
-space_col_align : second->orig_line is 5, orig_col is 11 [WORD/NONE], text() 'n', [CallStack]
-do_space : orig_line is 5, orig_col is 10, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 5, first->orig_col is 10, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
-   second->orig_line is 5, second->orig_col is 11, second->text() 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'n'
-space_col_align :    => first->orig_col   is 10
-space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 5, orig_col is 11, [WORD/NONE], text() 'n' <==>
-space_col_align : second->orig_line is 5, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
-do_space : orig_line is 5, orig_col is 11, first->text() 'n', type is WORD
-do_space : first->orig_line is 5, first->orig_col is 11, first->text() is 'n', [WORD/NONE] <===>
-   second->orig_line is 5, second->orig_col is 12, second->text() ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 5
-space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is 'n'
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 11
-space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 5, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
-space_col_align : second->orig_line is 5, orig_col is 13 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 5, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_macro_brace'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 6, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], text() '{' <==>
-space_col_align : second->orig_line is 6, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 6, orig_col is 1, first->text() '{', type is BRACE_OPEN
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 7, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text() '}' <==>
-space_col_align : second->orig_line is 7, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 7, orig_col is 1, first->text() '}', type is BRACE_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 9, orig_col is 1, [DESTRUCTOR/FUNC_CLASS_DEF], text() '~' <==>
-space_col_align : second->orig_line is 9, orig_col is 2 [FUNC_CLASS_DEF/DESTRUCTOR], text() 'TelegramIndex', [CallStack]
-do_space : orig_line is 9, orig_col is 1, first->text() '~', type is DESTRUCTOR
-do_space : first->orig_line is 9, first->orig_col is 1, first->text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
-   second->orig_line is 9, second->orig_col is 2, second->text() 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 9, orig_col is 2, [FUNC_CLASS_DEF/DESTRUCTOR], text() 'TelegramIndex' <==>
-space_col_align : second->orig_line is 9, orig_col is 15 [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(', [CallStack]
-do_space : orig_line is 9, orig_col is 2, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
-do_space : first->orig_line is 9, first->orig_col is 2, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
-   second->orig_line is 9, second->orig_col is 15, second->text() '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
-space_col_align : av is ignore
-space_col_align :    len is 13
-space_col_align :    => coldiff is 13
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 9
-space_col_align :    => second->orig_line is 9
-space_col_align :    => first->text()     is 'TelegramIndex'
-space_col_align :    => second->text()    is '('
-space_col_align :    => first->orig_col   is 2
-space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->len()      is 13
-space_col_align :    => coldiff is 13
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 9, orig_col is 15, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
-space_col_align : second->orig_line is 9, orig_col is 16 [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')', [CallStack]
-do_space : orig_line is 9, orig_col is 15, first->text() '(', type is FPAREN_OPEN
-do_space : first->orig_line is 9, first->orig_col is 15, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
-   second->orig_line is 9, second->orig_col is 16, second->text() ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 9
-space_col_align :    => second->orig_line is 9
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is ')'
-space_col_align :    => first->orig_col   is 15
-space_col_align :    => second->orig_col  is 16
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 9, orig_col is 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
-space_col_align : second->orig_line is 9, orig_col is 17 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 9, orig_col is 16, first->text() ')', type is FPAREN_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_macro_brace'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 10, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], text() '{' <==>
-space_col_align : second->orig_line is 10, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 10, orig_col is 1, first->text() '{', type is BRACE_OPEN
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 11, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text() '}' <==>
-space_col_align : second->orig_line is 11, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 11, orig_col is 1, first->text() '}', type is BRACE_CLOSE
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 13, orig_col is 1, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 13, orig_col is 7 [TYPE/NONE], text() 'char', [CallStack]
-do_space : orig_line is 13, orig_col is 1, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 1, first->text() is 'const', [QUALIFIER/NONE] <===>
-   second->orig_line is 13, second->orig_col is 7, second->text() 'char', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'const' and 'char'>space_col_align : av is force
-space_col_align :    len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 13, orig_col is 7, [TYPE/NONE], text() 'char' <==>
-space_col_align : second->orig_line is 13, orig_col is 11 [PTR_TYPE/NONE], text() '*', [CallStack]
-do_space : orig_line is 13, orig_col is 7, first->text() 'char', type is TYPE
-do_space : first->orig_line is 13, first->orig_col is 7, first->text() is 'char', [TYPE/NONE] <===>
-   second->orig_line is 13, second->orig_col is 11, second->text() '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 13
-space_col_align :    => second->orig_line is 13
-space_col_align :    => first->text()     is 'char'
-space_col_align :    => second->text()    is '*'
-space_col_align :    => first->orig_col   is 7
-space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->len()      is 4
-space_col_align :    => coldiff is 4
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 13, orig_col is 11, [PTR_TYPE/NONE], text() '*' <==>
-space_col_align : second->orig_line is 13, orig_col is 13 [QUALIFIER/NONE], text() 'const', [CallStack]
-do_space : orig_line is 13, orig_col is 11, first->text() '*', type is PTR_TYPE
-do_space : first->orig_line is 13, first->orig_col is 11, first->text() is '*', [PTR_TYPE/NONE] <===>
-   second->orig_line is 13, second->orig_col is 13, second->text() 'const', [QUALIFIER/NONE] : rule IGNORE[ ]
-space_col_align : av is ignore
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is IGNORE
-space_col_align :    => first->orig_line  is 13
-space_col_align :    => second->orig_line is 13
-space_col_align :    => first->text()     is '*'
-space_col_align :    => second->text()    is 'const'
-space_col_align :    => first->orig_col   is 11
-space_col_align :    => second->orig_col  is 13
-space_col_align :    => first->len()      is 1
-space_col_align :    => coldiff is 2
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 13, orig_col is 13, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 13, orig_col is 19 [WORD/NONE], text() 'pTelName', [CallStack]
-do_space : orig_line is 13, orig_col is 13, first->text() 'const', type is QUALIFIER
-do_space : first->orig_line is 13, first->orig_col is 13, first->text() is 'const', [QUALIFIER/NONE] <===>
-   second->orig_line is 13, second->orig_col is 19, second->text() 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
- <force between 'const' and 'pTelName'>space_col_align : av is force
-space_col_align :    len is 5
-space_col_align :    => coldiff is 5
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 6
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 13, orig_col is 19, [WORD/NONE], text() 'pTelName' <==>
-space_col_align : second->orig_line is 13, orig_col is 27 [SEMICOLON/NONE], text() ';', [CallStack]
-do_space : orig_line is 13, orig_col is 19, first->text() 'pTelName', type is WORD
-do_space : first->orig_line is 13, first->orig_col is 19, first->text() is 'pTelName', [WORD/NONE] <===>
-   second->orig_line is 13, second->orig_col is 27, second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
-space_col_align : av is remove
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 8
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 13, orig_col is 27, [SEMICOLON/NONE], text() ';' <==>
-space_col_align : second->orig_line is 13, orig_col is 28 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 13, orig_col is 27, first->text() ';', type is SEMICOLON
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-space_col_align : first->orig_line is 14, orig_col is 1, [TYPE/NONE], text() 'unsigned' <==>
-space_col_align : second->orig_line is 14, orig_col is 10 [TYPE/NONE], text() 'long', [CallStack]
-do_space : orig_line is 14, orig_col is 1, first->text() 'unsigned', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 1, first->text() is 'unsigned', [TYPE/NONE] <===>
-   second->orig_line is 14, second->orig_col is 10, second->text() 'long', [TYPE/NONE] : rule sp_after_type[ ]
- <force between 'unsigned' and 'long'>space_col_align : av is force
-space_col_align :    len is 8
-space_col_align :    => coldiff is 8
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 9
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 14, orig_col is 10, [TYPE/NONE], text() 'long' <==>
-space_col_align : second->orig_line is 14, orig_col is 15 [WORD/NONE], text() 'nTelIndex', [CallStack]
-do_space : orig_line is 14, orig_col is 10, first->text() 'long', type is TYPE
-do_space : first->orig_line is 14, first->orig_col is 10, first->text() is 'long', [TYPE/NONE] <===>
-   second->orig_line is 14, second->orig_col is 15, second->text() 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
- <force between 'long' and 'nTelIndex'>space_col_align : av is force
-space_col_align :    len is 4
-space_col_align :    => coldiff is 4
-space_col_align :    => av is FORCE
-space_col_align :    => coldiff is 5
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 14, orig_col is 15, [WORD/NONE], text() 'nTelIndex' <==>
-space_col_align : second->orig_line is 14, orig_col is 24 [SEMICOLON/NONE], text() ';', [CallStack]
-do_space : orig_line is 14, orig_col is 15, first->text() 'nTelIndex', type is WORD
-do_space : first->orig_line is 14, first->orig_col is 15, first->text() is 'nTelIndex', [WORD/NONE] <===>
-   second->orig_line is 14, second->orig_col is 24, second->text() ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
-space_col_align : av is remove
-space_col_align :    len is 9
-space_col_align :    => coldiff is 9
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 9
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-space_col_align : first->orig_line is 14, orig_col is 24, [SEMICOLON/NONE], text() ';' <==>
-space_col_align : second->orig_line is 14, orig_col is 25 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 14, orig_col is 24, first->text() ';', type is SEMICOLON
-space_col_align : av is remove
-space_col_align :    len is 1
-space_col_align :    => coldiff is 1
-space_col_align :    => av is REMOVE
-space_col_align :    => coldiff is 1
-log_rule(reindent_line): rule is 'indent_relative_single_line_comments'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(uncrustify_file): rule is 'mod_add_long_switch_closebrace_comment'
-log_rule(uncrustify_file): rule is 'mod_add_long_function_closebrace_comment'
-log_rule(uncrustify_file): rule is 'mod_add_long_class_closebrace_comment'
-log_rule(uncrustify_file): rule is 'mod_add_long_namespace_closebrace_comment'
-log_rule(uncrustify_file): rule is 'mod_add_long_ifdef_else_comment'
-log_rule(uncrustify_file): rule is 'mod_add_long_ifdef_endif_comment'
-log_rule(align_all): rule is 'align_typedef_span'
-log_rule(align_all): rule is 'align_left_shift'
-log_rule(Flush): rule is 'align_on_tabstop'
-log_rule(Flush): rule is 'align_on_tabstop'
-log_rule(Flush): rule is 'align_on_tabstop'
-log_rule(align_all): rule is 'align_eigen_comma_init'
-log_rule(align_all): rule is 'align_oc_msg_colon_span'
-log_rule(align_all): rule is 'align_var_def_span'
-log_rule(align_all): rule is 'align_var_struct_span'
-log_rule(align_all): rule is 'align_var_class_span'
-log_rule(align_all): rule is 'align_enum_equ_span'
-log_rule(align_all): rule is 'align_assign_span'
-log_rule(align_all): rule is 'align_assign_thresh'
-log_rule(align_all): rule is 'align_struct_init_span'
-log_rule(align_all): rule is 'align_func_proto_span'
-log_rule(align_all): rule is 'align_mix_var_proto'
-log_rule(align_all): rule is 'align_oc_msg_spec_span'
-log_rule(align_all): rule is 'align_oc_decl_colon'
-log_rule(align_all): rule is 'align_asm_colon'
-log_rule(align_all): rule is 'align_func_params'
-log_rule(align_all): rule is 'align_func_params_span'
-log_rule(align_all): rule is 'align_same_func_call_params'
-log_rule(indent_text): rule is 'indent_columns'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_macro_brace'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_class_colon'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_macro_brace'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_align_paren'
-log_rule(indent_text): rule is 'indent_paren_nl'
-log_rule(indent_text): rule is 'indent_square_nl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'use_indent_continue_only_once'
-log_rule(indent_text): rule is 'indent_paren_after_func_decl'
-log_rule(indent_text): rule is 'indent_paren_after_func_def'
-log_rule(indent_text): rule is 'indent_paren_after_func_call'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_macro_brace'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_continue'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'pos_conditional'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(indent_text): rule is 'indent_col1_multi_string_literal'
-log_rule(indent_text): rule is 'use_options_overriding_for_qt_macros'
-log_rule(indent_text): rule is 'indent_brace_parent'
-log_rule(indent_text): rule is 'indent_func_def_force_col1'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_inside_ternary_operator'
-log_rule(indent_text): rule is 'indent_access_spec_body'
-log_rule(indent_text): rule is 'indent_oc_inside_msg_sel'
-log_rule(indent_text): rule is 'indent_single_newlines'
-log_rule(indent_text): rule is 'indent_braces'
-log_rule(indent_text): rule is 'indent_braces_no_func'
-log_rule(indent_text): rule is 'indent_braces_no_class'
-log_rule(indent_text): rule is 'indent_braces_no_struct'
-log_rule(indent_text): rule is 'indent_shift'
-log_rule(indent_text): rule is 'indent_xml_string'
-log_rule(indent_text): rule is 'indent_continue_class_head'
-log_rule(uncrustify_file): rule is 'code_width'
-log_rule(uncrustify_file): rule is 'align_nl_cont'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(next_tab_column): rule is 'output_tab_size'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'indent_with_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
-log_rule(output_text): rule is 'align_with_tabs'
-log_rule(output_text): rule is 'align_keep_tabs'
-log_rule(output_text): rule is 'cmt_convert_tab_to_spaces'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/class_enum_struct_union.csv b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/class_enum_struct_union.csv
deleted file mode 100644
index d08f32fd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/class_enum_struct_union.csv
+++ /dev/null
@@ -1,684 +0,0 @@
-number of loops,4,
-language,CPP,
-Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig Sp Before,Br,Lvl,pp,Flags,Nl Before,Nl After,Text,
-1,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,3,0,0,0,"",9,0," /**    * the enum (and variable declarations thereof) could be of    * the following forms:    *    * ""enum type [: integral_type] { ... } [x, ...]""    * ""enum type [: integral_type]""    * ""enum class type [: integral_type] { ... } [x, ...]""    * ""enum class type [: integral_type]""    * ""enum [: integral_type] { ... } x, ...""    */"
-10,NEWLINE,NONE,PARENT_NOT_SET,7,7,4,0,0,0,0,"",2,0,
-12,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,0,0,0,0,"",9,0," /**    * the class/struct (and variable declarations thereof) could be of    * the following forms:    *    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }    * template<...> class/struct[<...>] [macros/attributes ...] type    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]    * class/struct [macros/attributes ...] type [x, ...]    * class/struct [macros/attributes ...] [: bases] { } x, ...    */"
-21,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0,
-23,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-23,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,0,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-23,MACRO_FUNC,NONE,PARENT_NOT_SET,9,9,16,1,1,1,0,"IN_PREPROC,EXPR_START",0,0,"         ALIGNAS"
-23,FPAREN_OPEN,MACRO_FUNC,PARENT_NOT_SET,16,16,17,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                ("
-23,WORD,NONE,PARENT_NOT_SET,17,17,31,0,1,2,0,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                 byte_alignment"
-23,FPAREN_CLOSE,MACRO_FUNC,PARENT_NOT_SET,31,31,32,0,1,1,0,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                               )"
-23,ATTRIBUTE,NONE,PARENT_NOT_SET,33,33,46,1,1,1,0,"IN_PREPROC",0,0,"                                 __attribute__"
-23,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,46,46,47,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                              ("
-23,PAREN_OPEN,NONE,PARENT_NOT_SET,47,47,48,0,1,2,0,"IN_PREPROC,EXPR_START,PUNCTUATOR",0,0,"                                               ("
-23,FUNC_CALL,NONE,PARENT_NOT_SET,48,48,55,0,1,3,0,"IN_PREPROC,EXPR_START",0,0,"                                                aligned"
-23,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,55,55,56,0,1,3,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                       ("
-23,WORD,NONE,PARENT_NOT_SET,56,56,70,0,1,4,0,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                                        byte_alignment"
-23,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,70,70,71,0,1,3,0,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                      )"
-23,PAREN_CLOSE,NONE,PARENT_NOT_SET,71,71,72,0,1,2,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                       )"
-23,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,72,72,73,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                        )"
-23,NEWLINE,NONE,PARENT_NOT_SET,73,73,1,0,0,0,0,"",2,0,
-25,PREPROC,PP_IF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-25,PP_IF,NONE,PARENT_NOT_SET,2,2,4,0,0,0,1,"IN_PREPROC,FORCE_SPACE",0,0,"  if"
-25,PP_DEFINED,NONE,PARENT_NOT_SET,5,5,12,1,0,0,1,"IN_PREPROC,EXPR_START",0,0,"     defined"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"             ("
-25,WORD,NONE,PARENT_NOT_SET,14,14,22,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"              __unix__"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,22,22,23,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                      )"
-25,BOOL,NONE,PARENT_NOT_SET,24,24,26,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                        ||"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,27,27,28,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                           ("
-25,PP_DEFINED,NONE,PARENT_NOT_SET,28,28,35,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                            defined"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,36,36,37,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                    ("
-25,WORD,NONE,PARENT_NOT_SET,37,37,46,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                                     __APPLE__"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,46,46,47,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                              )"
-25,BOOL,NONE,PARENT_NOT_SET,48,48,50,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                &&"
-25,PP_DEFINED,NONE,PARENT_NOT_SET,51,51,58,1,0,0,1,"IN_PREPROC",0,0,"                                                   defined"
-25,PAREN_OPEN,NONE,PARENT_NOT_SET,59,59,60,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                           ("
-25,WORD,NONE,PARENT_NOT_SET,60,60,68,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                                                            __MACH__"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,68,68,69,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                    )"
-25,PAREN_CLOSE,NONE,PARENT_NOT_SET,69,69,70,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                     )"
-25,NEWLINE,NONE,PARENT_NOT_SET,70,70,1,0,0,0,1,"",1,0,
-26,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-26,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-26,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"         API_EXPORT"
-26,ATTRIBUTE,NONE,PARENT_NOT_SET,20,20,33,1,1,1,1,"IN_PREPROC,EXPR_START",0,0,"                    __attribute__"
-26,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,34,34,35,1,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                  ("
-26,PAREN_OPEN,NONE,PARENT_NOT_SET,35,35,36,0,1,2,1,"IN_PREPROC,EXPR_START,PUNCTUATOR",0,0,"                                   ("
-26,FUNC_CALL,NONE,PARENT_NOT_SET,36,36,46,0,1,3,1,"IN_PREPROC,EXPR_START",0,0,"                                    visibility"
-26,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,46,46,47,0,1,3,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                              ("
-26,STRING,PP_INCLUDE,PARENT_NOT_SET,47,47,56,0,1,4,1,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                               ""default"""
-26,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,56,56,57,0,1,3,1,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                                                        )"
-26,PAREN_CLOSE,NONE,PARENT_NOT_SET,57,57,58,0,1,2,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                         )"
-26,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,58,58,59,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                          )"
-26,NEWLINE,NONE,PARENT_NOT_SET,59,59,1,0,0,0,1,"",1,0,
-27,PREPROC,PP_ELSE,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-27,PP_ELSE,NONE,PARENT_NOT_SET,2,2,6,0,0,0,1,"IN_PREPROC,FORCE_SPACE",0,0,"  elif"
-27,PP_DEFINED,NONE,PARENT_NOT_SET,7,7,14,1,0,0,1,"IN_PREPROC,FORCE_SPACE,EXPR_START",0,0,"       defined"
-27,WORD,NONE,PARENT_NOT_SET,15,15,21,1,0,0,1,"IN_PREPROC",0,0,"               _WIN32"
-27,NEWLINE,NONE,PARENT_NOT_SET,21,21,1,0,0,0,1,"",1,0,
-28,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-28,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-28,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"         API_EXPORT"
-28,DECLSPEC,NONE,PARENT_NOT_SET,20,20,30,1,1,1,1,"IN_PREPROC,EXPR_START",0,0,"                    __declspec"
-28,PAREN_OPEN,DECLSPEC,PARENT_NOT_SET,30,30,31,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                              ("
-28,WORD,NONE,PARENT_NOT_SET,31,31,40,0,1,2,1,"IN_PREPROC,EXPR_START",0,0,"                               dllexport"
-28,PAREN_CLOSE,DECLSPEC,PARENT_NOT_SET,40,40,41,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                        )"
-28,NEWLINE,NONE,PARENT_NOT_SET,41,41,1,0,0,0,1,"",1,0,
-29,PREPROC,PP_ELSE,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-29,PP_ELSE,NONE,PARENT_NOT_SET,2,2,6,0,0,0,1,"IN_PREPROC",0,0,"  else"
-29,NEWLINE,NONE,PARENT_NOT_SET,6,6,1,0,0,0,1,"",1,0,
-30,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
-30,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
-30,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC",0,0,"         API_EXPORT"
-30,NEWLINE,NONE,PARENT_NOT_SET,19,19,1,0,0,0,1,"",1,0,
-31,PREPROC,PP_ENDIF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
-31,PP_ENDIF,NONE,PARENT_NOT_SET,2,2,7,0,0,0,0,"IN_PREPROC",0,0,"  endif"
-31,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0,
-33,NAMESPACE,NONE,PARENT_NOT_SET,1,1,10,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," namespace"
-33,WORD,NAMESPACE,PARENT_NOT_SET,11,11,26,1,0,0,0,"LVALUE",0,0,"           outer_namespace"
-33,NEWLINE,NONE,PARENT_NOT_SET,26,26,1,0,0,0,0,"",1,0,
-34,BRACE_OPEN,NAMESPACE,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," {"
-34,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_NAMESPACE",2,0,
-36,NAMESPACE,NONE,PARENT_NOT_SET,1,1,10,0,1,1,0,"IN_NAMESPACE,FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," namespace"
-36,WORD,NAMESPACE,PARENT_NOT_SET,11,11,26,1,1,1,0,"IN_NAMESPACE,LVALUE",0,0,"           inner_namespace"
-36,NEWLINE,NONE,PARENT_NOT_SET,26,26,1,0,1,1,0,"IN_NAMESPACE",1,0,
-37,BRACE_OPEN,NAMESPACE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_NAMESPACE,PUNCTUATOR",0,0," {"
-37,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,2,2,0,"IN_NAMESPACE",2,0,
-39,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,2,2,0,"IN_NAMESPACE,FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," class"
-39,TYPE,CLASS,PARENT_NOT_SET,7,7,12,1,2,2,0,"IN_NAMESPACE,LVALUE",0,0,"       Base1"
-39,BRACE_OPEN,CLASS,PARENT_NOT_SET,13,13,14,1,2,2,0,"IN_CLASS,IN_NAMESPACE,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"             {"
-39,BRACE_CLOSE,CLASS,PARENT_NOT_SET,15,15,16,1,2,2,0,"IN_CLASS,IN_NAMESPACE,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"               }"
-39,SEMICOLON,CLASS,PARENT_NOT_SET,16,16,17,0,2,2,0,"PUNCTUATOR",0,0,"                ;"
-39,NEWLINE,NONE,PARENT_NOT_SET,17,17,1,0,2,2,0,"",2,0,
-41,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,2,2,0,"STMT_START,EXPR_START,LVALUE",0,0," template"
-41,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,2,2,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"         <"
-41,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,2,3,0,"IN_TEMPLATE,EXPR_START,LVALUE",0,0,"          typename"
-41,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,18,18,19,0,2,2,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                  >"
-41,CLASS,TEMPLATE,PARENT_NOT_SET,20,20,25,1,2,2,0,"FORCE_SPACE,EXPR_START,LVALUE",0,0,"                    class"
-41,TYPE,CLASS,PARENT_NOT_SET,26,26,31,1,2,2,0,"LVALUE",0,0,"                          Base2"
-41,BRACE_OPEN,CLASS,PARENT_NOT_SET,32,32,33,1,2,2,0,"IN_CLASS,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"                                {"
-41,BRACE_CLOSE,CLASS,PARENT_NOT_SET,34,34,35,1,2,2,0,"IN_CLASS,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"                                  }"
-41,SEMICOLON,CLASS,PARENT_NOT_SET,35,35,36,0,2,2,0,"PUNCTUATOR",0,0,"                                   ;"
-41,NEWLINE,NONE,PARENT_NOT_SET,36,36,1,0,2,2,0,"",2,0,
-43,BRACE_CLOSE,NAMESPACE,PARENT_NOT_SET,1,1,2,0,1,1,0,"PUNCTUATOR",0,0," }"
-43,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"",2,0,
-45,BRACE_CLOSE,NAMESPACE,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," }"
-45,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,0,0,0,"",2,0,
-47,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,82,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }"
-47,NEWLINE,NONE,PARENT_NOT_SET,82,82,1,0,0,0,0,"",1,0,
-48,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
-48,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-48,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
-48,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
-48,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
-48,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
-48,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
-48,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
-49,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START",0,0," class"
-49,TYPE,CLASS,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-49,ATTRIBUTE,CLASS,PARENT_NOT_SET,18,18,31,1,0,0,0,"",0,0,"                  __attribute__"
-49,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,31,31,32,0,0,0,0,"PUNCTUATOR",0,0,"                               ("
-49,PAREN_OPEN,NONE,PARENT_NOT_SET,32,32,33,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                ("
-49,TYPE,NONE,PARENT_NOT_SET,33,33,47,0,0,2,0,"EXPR_START",0,0,"                                 __deprecated__"
-49,PAREN_CLOSE,NONE,PARENT_NOT_SET,47,47,48,0,0,1,0,"PUNCTUATOR",0,0,"                                               )"
-49,FPAREN_CLOSE,FUNC_DEF,PARENT_NOT_SET,48,48,49,0,0,0,0,"PUNCTUATOR",0,0,"                                                )"
-49,FUNC_DEF,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                                                  ALIGNAS"
-49,FPAREN_OPEN,FUNC_DEF,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
-49,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"IN_FCN_DEF,EXPR_START",0,0,"                                                          4"
-49,FPAREN_CLOSE,FUNC_DEF,PARENT_NOT_SET,59,59,60,0,0,0,0,"IN_FCN_DEF,PUNCTUATOR",0,0,"                                                           )"
-49,WORD,FUNC_DEF,PARENT_NOT_SET,61,61,63,1,0,0,0,"VAR_DEF,OLD_FCN_PARAMS",0,0,"                                                             c1"
-49,NEWLINE,NONE,PARENT_NOT_SET,63,63,1,0,0,0,0,"",1,0,
-50,CLASS_COLON,FUNC_DEF,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"         :"
-50,QUALIFIER,FUNC_DEF,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,OLD_FCN_PARAMS",0,0,"           public"
-50,TYPE,FUNC_DEF,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS",0,0,"                  outer_namespace"
-50,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                 ::"
-50,TYPE,FUNC_DEF,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS",0,0,"                                   inner_namespace"
-50,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                  ::"
-50,WORD,FUNC_DEF,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE,VAR_DEF,VAR_1ST,OLD_FCN_PARAMS",0,0,"                                                    Base1"
-50,COMMA,FUNC_DEF,PARENT_NOT_SET,57,49,50,0,0,0,0,"IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                         ,"
-50,NEWLINE,NONE,PARENT_NOT_SET,58,50,3,0,0,0,0,"",1,0,
-51,QUALIFIER,FUNC_DEF,PARENT_NOT_SET,9,3,9,0,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,EXPR_START,OLD_FCN_PARAMS",0,0,"         public"
-51,TYPE,FUNC_DEF,PARENT_NOT_SET,16,10,25,1,0,0,0,"IN_CLASS_BASE,OLD_FCN_PARAMS",0,0,"                outer_namespace"
-51,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,31,25,27,0,0,0,0,"IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                               ::"
-51,TYPE,FUNC_DEF,PARENT_NOT_SET,33,27,42,0,0,0,0,"IN_CLASS_BASE,OLD_FCN_PARAMS",0,0,"                                 inner_namespace"
-51,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,48,42,44,0,0,0,0,"IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                ::"
-51,WORD,FUNC_DEF,PARENT_NOT_SET,50,44,49,0,0,0,0,"IN_CLASS_BASE,VAR_DEF,OLD_FCN_PARAMS",0,0,"                                                  Base2"
-51,ANGLE_OPEN,FUNC_DEF,PARENT_NOT_SET,55,49,50,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                       <"
-51,TYPE,FUNC_DEF,PARENT_NOT_SET,56,50,65,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START,OLD_FCN_PARAMS",0,0,"                                                        outer_namespace"
-51,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,71,65,67,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                                       ::"
-51,TYPE,FUNC_DEF,PARENT_NOT_SET,73,67,82,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS",0,0,"                                                                         inner_namespace"
-51,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,88,82,84,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                                                        ::"
-51,TYPE,FUNC_DEF,PARENT_NOT_SET,90,84,89,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS",0,0,"                                                                                          Base1"
-51,ANGLE_CLOSE,FUNC_DEF,PARENT_NOT_SET,95,89,90,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                                                               >"
-51,NEWLINE,NONE,PARENT_NOT_SET,96,90,1,0,0,0,0,"",1,0,
-52,BRACE_OPEN,FUNC_DEF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EXPR_START,EMPTY_BODY,PUNCTUATOR",0,0," {"
-52,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"",2,0,
-54,BRACE_CLOSE,FUNC_DEF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0," }"
-54,SEMICOLON,CLASS,PARENT_NOT_SET,2,2,3,0,0,0,0,"PUNCTUATOR",0,0,"  ;"
-54,NEWLINE,NONE,PARENT_NOT_SET,3,3,1,0,0,0,0,"",2,0,
-56,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,70,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type { }"
-56,NEWLINE,NONE,PARENT_NOT_SET,70,70,1,0,0,0,0,"",1,0,
-57,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
-57,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-57,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
-57,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
-57,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START,LVALUE",0,0,"                    typename"
-57,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                             ..."
-57,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                >"
-57,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
-58,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START,LVALUE",0,0," class"
-58,TYPE,CLASS,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE,LVALUE",0,0,"       API_EXPORT"
-58,WORD,CLASS,PARENT_NOT_SET,18,18,20,1,0,0,0,"VAR_DEF,VAR_1ST,LVALUE",0,0,"                  c2"
-58,NEWLINE,NONE,PARENT_NOT_SET,20,20,1,0,0,0,0,"",1,0,
-59,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," {"
-59,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"",1,0,
-60,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START,LVALUE",0,0," public"
-60,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,LVALUE,PUNCTUATOR",0,0,"       :"
-60,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"",2,0,
-62,TEMPLATE,NONE,PARENT_NOT_SET,1,4,12,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START,LVALUE",0,0," template"
-62,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,12,13,0,1,1,0,"IN_TEMPLATE,IN_CLASS,LVALUE,PUNCTUATOR",0,0,"         <"
-62,TYPENAME,NONE,PARENT_NOT_SET,10,13,21,0,1,2,0,"IN_TEMPLATE,IN_CLASS,FORCE_SPACE,EXPR_START,LVALUE",0,0,"          typename"
-62,TYPE,NONE,PARENT_NOT_SET,19,22,23,1,1,2,0,"IN_TEMPLATE,IN_CLASS,LVALUE",0,0,"                   T"
-62,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,20,23,24,0,1,1,0,"IN_TEMPLATE,IN_CLASS,LVALUE,PUNCTUATOR",0,0,"                    >"
-62,NEWLINE,NONE,PARENT_NOT_SET,21,24,4,0,1,1,0,"",1,0,
-63,STRUCT,TEMPLATE,PARENT_NOT_SET,1,4,10,0,1,1,0,"IN_CLASS,FORCE_SPACE,EXPR_START,LVALUE",0,0," struct"
-63,TYPE,STRUCT,PARENT_NOT_SET,8,11,22,1,1,1,0,"IN_CLASS,LVALUE",0,0,"        inner_class"
-63,NEWLINE,NONE,PARENT_NOT_SET,19,22,4,0,1,1,0,"",1,0,
-64,BRACE_OPEN,STRUCT,PARENT_NOT_SET,1,4,5,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0," {"
-64,NEWLINE,NONE,PARENT_NOT_SET,2,5,7,0,2,2,0,"IN_STRUCT",1,0,
-65,QUALIFIER,NONE,PARENT_NOT_SET,9,7,13,0,2,2,0,"IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0,"         static"
-65,TYPE,NONE,PARENT_NOT_SET,16,14,25,1,2,2,0,"IN_STRUCT,IN_CLASS,VAR_TYPE",0,0,"                inner_class"
-65,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,27,25,26,0,2,2,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                           <"
-65,TYPE,NONE,PARENT_NOT_SET,28,26,27,0,2,3,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,EXPR_START",0,0,"                            T"
-65,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,29,27,28,0,2,2,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                             >"
-65,PTR_TYPE,NONE,PARENT_NOT_SET,31,29,30,1,2,2,0,"IN_STRUCT,IN_CLASS,EXPR_START,VAR_TYPE,PUNCTUATOR",0,0,"                               *"
-65,WORD,NONE,PARENT_NOT_SET,32,30,43,0,2,2,0,"IN_STRUCT,IN_CLASS,EXPR_START,VAR_DEF,VAR_1ST",0,0,"                                m_inner_class"
-65,SEMICOLON,CLASS,PARENT_NOT_SET,45,43,44,0,2,2,0,"IN_STRUCT,IN_CLASS,PUNCTUATOR",0,0,"                                             ;"
-65,NEWLINE,NONE,PARENT_NOT_SET,46,44,4,0,2,2,0,"IN_STRUCT",1,0,
-66,BRACE_CLOSE,STRUCT,PARENT_NOT_SET,1,4,5,0,1,1,0,"IN_STRUCT,IN_CLASS,PUNCTUATOR",0,0," }"
-66,SEMICOLON,STRUCT,PARENT_NOT_SET,2,5,6,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"  ;"
-66,NEWLINE,NONE,PARENT_NOT_SET,3,6,1,0,1,1,0,"",1,0,
-67,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
-67,SEMICOLON,CLASS,PARENT_NOT_SET,2,2,3,0,0,0,0,"PUNCTUATOR",0,0,"  ;"
-67,NEWLINE,NONE,PARENT_NOT_SET,3,3,1,0,0,0,0,"",2,0,
-69,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START,LVALUE",0,0," template"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"         <"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,10,10,11,0,0,0,0,"IN_TEMPLATE,EXPR_START,LVALUE,PUNCTUATOR",0,0,"          >"
-69,TEMPLATE,NONE,PARENT_NOT_SET,12,12,20,1,0,0,0,"EXPR_START,LVALUE",0,0,"            template"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,20,20,21,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                    <"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,21,21,22,0,0,0,0,"IN_TEMPLATE,EXPR_START,LVALUE,PUNCTUATOR",0,0,"                     >"
-69,STRUCT,TEMPLATE,PARENT_NOT_SET,23,23,29,1,0,0,0,"FORCE_SPACE,EXPR_START,LVALUE",0,0,"                       struct"
-69,TYPE,STRUCT,PARENT_NOT_SET,30,30,40,1,0,0,0,"FORCE_SPACE,LVALUE",0,0,"                              API_EXPORT"
-69,WORD,STRUCT,PARENT_NOT_SET,41,41,43,1,0,0,0,"VAR_DEF,VAR_1ST,LVALUE",0,0,"                                         c2"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,43,43,44,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                           <"
-69,TYPE,NONE,PARENT_NOT_SET,44,44,47,0,0,1,0,"IN_TEMPLATE,EXPR_START,LVALUE",0,0,"                                            int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,47,47,48,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                               >"
-69,DC_MEMBER,NONE,PARENT_NOT_SET,48,48,50,0,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                                                ::"
-69,WORD,NONE,PARENT_NOT_SET,50,50,61,0,0,0,0,"VAR_DEF,LVALUE",0,0,"                                                  inner_class"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,61,61,62,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                                             <"
-69,TYPE,NONE,PARENT_NOT_SET,62,62,65,0,0,1,0,"IN_TEMPLATE,EXPR_START,LVALUE",0,0,"                                                              int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,65,65,66,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                                                 >"
-69,PTR_TYPE,NONE,PARENT_NOT_SET,67,67,68,1,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                                                                   *"
-69,WORD,NONE,PARENT_NOT_SET,68,68,70,0,0,0,0,"EXPR_START,VAR_DEF,LVALUE",0,0,"                                                                    c2"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,70,70,71,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                                                      <"
-69,TYPE,NONE,PARENT_NOT_SET,71,71,74,0,0,1,0,"IN_TEMPLATE,EXPR_START,LVALUE",0,0,"                                                                       int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,74,74,75,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                                                          >"
-69,DC_MEMBER,NONE,PARENT_NOT_SET,75,75,77,0,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                                                                           ::"
-69,WORD,NONE,PARENT_NOT_SET,77,77,88,0,0,0,0,"VAR_DEF,LVALUE",0,0,"                                                                             inner_class"
-69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,88,88,89,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                                                                        <"
-69,TYPE,NONE,PARENT_NOT_SET,89,89,92,0,0,1,0,"IN_TEMPLATE,EXPR_START,LVALUE",0,0,"                                                                                         int"
-69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,92,92,93,0,0,0,0,"IN_TEMPLATE,LVALUE,PUNCTUATOR",0,0,"                                                                                            >"
-69,DC_MEMBER,NONE,PARENT_NOT_SET,93,93,95,0,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                                                                                             ::"
-69,WORD,NONE,PARENT_NOT_SET,95,95,108,0,0,0,0,"VAR_DEF,LVALUE",0,0,"                                                                                               m_inner_class"
-69,ASSIGN,NONE,PARENT_NOT_SET,109,109,110,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                                             ="
-69,WORD,NONE,PARENT_NOT_SET,111,111,118,1,0,0,0,"EXPR_START",0,0,"                                                                                                               nullptr"
-69,SEMICOLON,TEMPLATE,PARENT_NOT_SET,118,118,119,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                      ;"
-69,NEWLINE,NONE,PARENT_NOT_SET,119,119,1,0,0,0,0,"",2,0,
-71,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,66,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type"
-71,NEWLINE,NONE,PARENT_NOT_SET,66,66,1,0,0,0,0,"",1,0,
-72,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
-72,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
-72,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
-72,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
-72,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
-72,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
-72,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
-72,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
-73,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START",0,0," class"
-73,TYPE,CLASS,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-73,WORD,CLASS,PARENT_NOT_SET,18,18,20,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                  c2"
-73,SEMICOLON,CLASS,PARENT_NOT_SET,20,20,21,0,0,0,0,"PUNCTUATOR",0,0,"                    ;"
-73,NEWLINE,NONE,PARENT_NOT_SET,21,21,1,0,0,0,0,"",2,0,
-75,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,68,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type : bases ... { } x, ..."
-75,NEWLINE,NONE,PARENT_NOT_SET,68,68,1,0,0,0,0,"",1,0,
-76,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
-76,TYPE,CLASS,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-76,ATTRIBUTE,CLASS,PARENT_NOT_SET,18,18,31,1,0,0,0,"",0,0,"                  __attribute__"
-76,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,31,31,32,0,0,0,0,"PUNCTUATOR",0,0,"                               ("
-76,PAREN_OPEN,NONE,PARENT_NOT_SET,32,32,33,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                ("
-76,TYPE,NONE,PARENT_NOT_SET,33,33,47,0,0,2,0,"EXPR_START",0,0,"                                 __deprecated__"
-76,PAREN_CLOSE,NONE,PARENT_NOT_SET,47,47,48,0,0,1,0,"PUNCTUATOR",0,0,"                                               )"
-76,FPAREN_CLOSE,FUNC_DEF,PARENT_NOT_SET,48,48,49,0,0,0,0,"PUNCTUATOR",0,0,"                                                )"
-76,FUNC_DEF,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                                                  ALIGNAS"
-76,FPAREN_OPEN,FUNC_DEF,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
-76,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"IN_FCN_DEF,EXPR_START",0,0,"                                                          4"
-76,FPAREN_CLOSE,FUNC_DEF,PARENT_NOT_SET,59,59,60,0,0,0,0,"IN_FCN_DEF,PUNCTUATOR",0,0,"                                                           )"
-76,WORD,FUNC_DEF,PARENT_NOT_SET,61,61,63,1,0,0,0,"VAR_DEF,OLD_FCN_PARAMS",0,0,"                                                             c3"
-76,NEWLINE,NONE,PARENT_NOT_SET,63,63,1,0,0,0,0,"",1,0,
-77,CLASS_COLON,FUNC_DEF,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"         :"
-77,QUALIFIER,FUNC_DEF,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,OLD_FCN_PARAMS",0,0,"           public"
-77,TYPE,FUNC_DEF,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS",0,0,"                  outer_namespace"
-77,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                 ::"
-77,TYPE,FUNC_DEF,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS",0,0,"                                   inner_namespace"
-77,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                  ::"
-77,WORD,FUNC_DEF,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE,VAR_DEF,VAR_1ST,OLD_FCN_PARAMS",0,0,"                                                    Base2"
-77,ANGLE_OPEN,FUNC_DEF,PARENT_NOT_SET,57,49,50,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                         <"
-77,TYPE,FUNC_DEF,PARENT_NOT_SET,58,50,53,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START,OLD_FCN_PARAMS",0,0,"                                                          int"
-77,ANGLE_CLOSE,FUNC_DEF,PARENT_NOT_SET,61,53,54,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                             >"
-77,COMMA,FUNC_DEF,PARENT_NOT_SET,62,54,55,0,0,0,0,"IN_CLASS_BASE,EXPR_START,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                              ,"
-77,NEWLINE,NONE,PARENT_NOT_SET,63,55,3,0,0,0,0,"",1,0,
-78,QUALIFIER,FUNC_DEF,PARENT_NOT_SET,9,3,9,0,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,EXPR_START,OLD_FCN_PARAMS",0,0,"         public"
-78,WORD,FUNC_DEF,PARENT_NOT_SET,16,10,12,1,0,0,0,"IN_CLASS_BASE,VAR_DEF,OLD_FCN_PARAMS",0,0,"                c2"
-78,ANGLE_OPEN,FUNC_DEF,PARENT_NOT_SET,18,12,13,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                  <"
-78,TYPE,FUNC_DEF,PARENT_NOT_SET,19,13,16,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START,OLD_FCN_PARAMS",0,0,"                   int"
-78,ANGLE_CLOSE,FUNC_DEF,PARENT_NOT_SET,22,16,17,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                      >"
-78,DC_MEMBER,FUNC_DEF,PARENT_NOT_SET,23,17,19,0,0,0,0,"IN_CLASS_BASE,EXPR_START,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                       ::"
-78,WORD,FUNC_DEF,PARENT_NOT_SET,25,19,30,0,0,0,0,"IN_CLASS_BASE,VAR_DEF,OLD_FCN_PARAMS",0,0,"                         inner_class"
-78,ANGLE_OPEN,FUNC_DEF,PARENT_NOT_SET,36,30,31,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                    <"
-78,TYPE,FUNC_DEF,PARENT_NOT_SET,37,31,34,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START,OLD_FCN_PARAMS",0,0,"                                     int"
-78,ANGLE_CLOSE,FUNC_DEF,PARENT_NOT_SET,40,34,35,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                        >"
-78,NEWLINE,NONE,PARENT_NOT_SET,41,35,1,0,0,0,0,"",1,0,
-79,BRACE_OPEN,FUNC_DEF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EXPR_START,PUNCTUATOR",0,0," {"
-79,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"",1,0,
-80,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
-80,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
-80,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"",1,0,
-81,FUNC_CALL,NONE,PARENT_NOT_SET,9,4,6,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0,"         c3"
-81,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,11,6,7,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"           ("
-81,TYPE,NONE,PARENT_NOT_SET,12,7,10,0,1,2,0,"IN_FCN_CALL,IN_CLASS,FORCE_SPACE,EXPR_START,LVALUE",0,0,"            int"
-81,WORD,NONE,PARENT_NOT_SET,16,11,12,1,1,2,0,"IN_FCN_CALL,IN_CLASS,LVALUE",0,0,"                x"
-81,ASSIGN,NONE,PARENT_NOT_SET,18,13,14,1,1,2,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                  ="
-81,NUMBER,NONE,PARENT_NOT_SET,20,15,16,1,1,2,0,"IN_FCN_CALL,IN_CLASS,EXPR_START",0,0,"                    0"
-81,COMMA,NONE,PARENT_NOT_SET,21,16,17,0,1,2,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                     ,"
-81,TYPE,NONE,PARENT_NOT_SET,23,18,21,1,1,2,0,"IN_FCN_CALL,IN_CLASS,FORCE_SPACE,EXPR_START,LVALUE",0,0,"                       int"
-81,WORD,NONE,PARENT_NOT_SET,27,22,23,1,1,2,0,"IN_FCN_CALL,IN_CLASS,LVALUE",0,0,"                           y"
-81,ASSIGN,NONE,PARENT_NOT_SET,29,24,25,1,1,2,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                             ="
-81,NUMBER,NONE,PARENT_NOT_SET,31,26,27,1,1,2,0,"IN_FCN_CALL,IN_CLASS,EXPR_START",0,0,"                               0"
-81,COMMA,NONE,PARENT_NOT_SET,32,27,28,0,1,2,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                                ,"
-81,TYPE,NONE,PARENT_NOT_SET,34,29,32,1,1,2,0,"IN_FCN_CALL,IN_CLASS,FORCE_SPACE,EXPR_START,LVALUE",0,0,"                                  int"
-81,WORD,NONE,PARENT_NOT_SET,38,33,34,1,1,2,0,"IN_FCN_CALL,IN_CLASS,LVALUE",0,0,"                                      z"
-81,ASSIGN,NONE,PARENT_NOT_SET,40,35,36,1,1,2,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                                        ="
-81,NUMBER,NONE,PARENT_NOT_SET,42,37,38,1,1,2,0,"IN_FCN_CALL,IN_CLASS,EXPR_START",0,0,"                                          0"
-81,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,43,38,39,0,1,1,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                                           )"
-81,CLASS_COLON,NONE,PARENT_NOT_SET,45,40,41,1,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                                             :"
-81,FUNC_CALL,NONE,PARENT_NOT_SET,47,42,45,1,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0,"                                               m_x"
-81,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,50,45,46,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                                                  ("
-81,WORD,NONE,PARENT_NOT_SET,51,46,47,0,1,2,0,"IN_FCN_CALL,IN_CLASS,EXPR_START",0,0,"                                                   x"
-81,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,52,47,48,0,1,1,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                                                    )"
-81,COMMA,NONE,PARENT_NOT_SET,53,48,49,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                                                     ,"
-81,FUNC_CALL,NONE,PARENT_NOT_SET,55,50,53,1,1,1,0,"IN_CLASS,EXPR_START",0,0,"                                                       m_y"
-81,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,58,53,54,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                                                          ("
-81,WORD,NONE,PARENT_NOT_SET,59,54,55,0,1,2,0,"IN_FCN_CALL,IN_CLASS,EXPR_START",0,0,"                                                           y"
-81,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,60,55,56,0,1,1,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                                                            )"
-81,COMMA,NONE,PARENT_NOT_SET,61,56,57,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                                                             ,"
-81,FUNC_CALL,NONE,PARENT_NOT_SET,63,58,61,1,1,1,0,"IN_CLASS,EXPR_START",0,0,"                                                               m_z"
-81,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,66,61,62,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                                                                  ("
-81,WORD,NONE,PARENT_NOT_SET,67,62,63,0,1,2,0,"IN_FCN_CALL,IN_CLASS,EXPR_START",0,0,"                                                                   z"
-81,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,68,63,64,0,1,1,0,"IN_FCN_CALL,IN_CLASS,PUNCTUATOR",0,0,"                                                                    )"
-81,BRACE_OPEN,FUNC_CALL,PARENT_NOT_SET,70,65,66,1,1,1,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0,"                                                                      {"
-81,NEWLINE,NONE,PARENT_NOT_SET,71,67,0,0,1,1,0,"IN_CLASS",1,0,
-81,BRACE_CLOSE,FUNC_CALL,PARENT_NOT_SET,9,67,68,1,1,1,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0,"         }"
-81,NEWLINE,NONE,PARENT_NOT_SET,10,68,4,0,1,1,0,"",2,0,
-83,TYPE,NONE,PARENT_NOT_SET,9,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0,"         int"
-83,WORD,NONE,PARENT_NOT_SET,13,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"             m_x"
-83,SEMICOLON,NONE,PARENT_NOT_SET,16,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                ;"
-83,NEWLINE,NONE,PARENT_NOT_SET,17,12,4,0,1,1,0,"",1,0,
-84,TYPE,NONE,PARENT_NOT_SET,9,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0,"         int"
-84,WORD,NONE,PARENT_NOT_SET,13,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"             m_y"
-84,SEMICOLON,NONE,PARENT_NOT_SET,16,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                ;"
-84,NEWLINE,NONE,PARENT_NOT_SET,17,12,4,0,1,1,0,"",1,0,
-85,TYPE,NONE,PARENT_NOT_SET,9,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0,"         int"
-85,WORD,NONE,PARENT_NOT_SET,13,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"             m_z"
-85,SEMICOLON,NONE,PARENT_NOT_SET,16,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                ;"
-85,NEWLINE,NONE,PARENT_NOT_SET,17,12,1,0,1,1,0,"",1,0,
-86,BRACE_CLOSE,FUNC_DEF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
-86,NEWLINE,NONE,PARENT_NOT_SET,2,1,0,0,0,0,0,"IN_CLASS",1,0,
-86,WORD,NONE,PARENT_NOT_SET,1,3,6,1,0,0,0,"STMT_START,EXPR_START",0,0," c31"
-86,COMMA,NONE,PARENT_NOT_SET,4,6,7,0,0,0,0,"PUNCTUATOR",0,0,"    ,"
-86,DEREF,NONE,PARENT_NOT_SET,6,8,9,1,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"      *"
-86,WORD,NONE,PARENT_NOT_SET,7,9,12,0,0,0,0,"EXPR_START,LVALUE",0,0,"       c32"
-86,ASSIGN,NONE,PARENT_NOT_SET,11,13,14,1,0,0,0,"PUNCTUATOR",0,0,"           ="
-86,WORD,NONE,PARENT_NOT_SET,13,15,22,1,0,0,0,"EXPR_START",0,0,"             nullptr"
-86,COMMA,NONE,PARENT_NOT_SET,20,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                    ,"
-86,DEREF,NONE,PARENT_NOT_SET,22,24,25,1,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                      *"
-86,WORD,NONE,PARENT_NOT_SET,23,25,28,0,0,0,0,"EXPR_START,LVALUE",0,0,"                       c33"
-86,TSQUARE,NONE,PARENT_NOT_SET,26,28,30,0,0,0,0,"LVALUE,PUNCTUATOR",0,0,"                          []"
-86,ASSIGN,NONE,PARENT_NOT_SET,29,31,32,1,0,0,0,"PUNCTUATOR",0,0,"                             ="
-86,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,31,33,34,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                               {"
-86,WORD,NONE,PARENT_NOT_SET,33,35,42,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                 nullptr"
-86,COMMA,NONE,PARENT_NOT_SET,40,42,43,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                        ,"
-86,WORD,NONE,PARENT_NOT_SET,42,44,51,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                          nullptr"
-86,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,50,52,53,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                  }"
-86,COMMA,NONE,PARENT_NOT_SET,51,53,54,0,0,0,0,"PUNCTUATOR",0,0,"                                                   ,"
-86,WORD,NONE,PARENT_NOT_SET,53,55,58,1,0,0,0,"EXPR_START,LVALUE",0,0,"                                                     c34"
-86,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,56,58,59,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                        {"
-86,NUMBER,NONE,PARENT_NOT_SET,58,60,61,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                          0"
-86,COMMA,NONE,PARENT_NOT_SET,59,61,62,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                           ,"
-86,NUMBER,NONE,PARENT_NOT_SET,61,63,64,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                             1"
-86,COMMA,NONE,PARENT_NOT_SET,62,64,65,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                              ,"
-86,NUMBER,NONE,PARENT_NOT_SET,64,66,67,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                2"
-86,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,65,67,68,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                 }"
-86,COMMA,NONE,PARENT_NOT_SET,66,68,69,0,0,0,0,"PUNCTUATOR",0,0,"                                                                  ,"
-86,DEREF,NONE,PARENT_NOT_SET,68,70,71,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                    *"
-86,QUALIFIER,NONE,PARENT_NOT_SET,69,72,77,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                                                                     const"
-86,FUNC_CALL,NONE,PARENT_NOT_SET,75,78,81,1,0,0,0,"",0,0,"                                                                           c35"
-86,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,78,81,82,0,0,0,0,"PUNCTUATOR",0,0,"                                                                              ("
-86,WORD,NONE,PARENT_NOT_SET,79,82,89,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                               nullptr"
-86,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,86,89,90,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                      )"
-86,COMMA,NONE,PARENT_NOT_SET,87,90,91,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                       ,"
-86,FUNC_CALL,NONE,PARENT_NOT_SET,89,92,95,1,0,0,0,"EXPR_START",0,0,"                                                                                         c16"
-86,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,92,95,96,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                            ("
-86,NUMBER,NONE,PARENT_NOT_SET,93,96,97,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                             0"
-86,COMMA,NONE,PARENT_NOT_SET,94,97,98,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                              ,"
-86,NUMBER,NONE,PARENT_NOT_SET,96,99,100,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                1"
-86,COMMA,NONE,PARENT_NOT_SET,97,100,101,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                 ,"
-86,NUMBER,NONE,PARENT_NOT_SET,99,102,103,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                   2"
-86,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,100,103,104,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                    )"
-86,SEMICOLON,NONE,PARENT_NOT_SET,101,104,105,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                     ;"
-86,NEWLINE,NONE,PARENT_NOT_SET,102,105,1,0,0,0,0,"",2,0,
-88,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,52,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type x, ..."
-88,NEWLINE,NONE,PARENT_NOT_SET,52,52,1,0,0,0,0,"",1,0,
-89,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
-89,ATTRIBUTE,NONE,PARENT_NOT_SET,7,7,20,1,0,0,0,"",0,0,"       __attribute__"
-89,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,20,20,21,0,0,0,0,"PUNCTUATOR",0,0,"                    ("
-89,PAREN_OPEN,NONE,PARENT_NOT_SET,21,21,22,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                     ("
-89,WORD,NONE,PARENT_NOT_SET,22,22,36,0,0,2,0,"EXPR_START",0,0,"                      __deprecated__"
-89,PAREN_CLOSE,NONE,PARENT_NOT_SET,36,36,37,0,0,1,0,"PUNCTUATOR",0,0,"                                    )"
-89,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,37,37,38,0,0,0,0,"PUNCTUATOR",0,0,"                                     )"
-89,TYPE,FUNC_DEF,PARENT_NOT_SET,39,39,49,1,0,0,0,"FORCE_SPACE",0,0,"                                       API_EXPORT"
-89,FUNC_DEF,CLASS,PARENT_NOT_SET,50,50,57,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                                                  ALIGNAS"
-89,FPAREN_OPEN,FUNC_DEF,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
-89,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"IN_FCN_DEF,EXPR_START",0,0,"                                                          4"
-89,FPAREN_CLOSE,FUNC_DEF,PARENT_NOT_SET,59,59,60,0,0,0,0,"IN_FCN_DEF,PUNCTUATOR",0,0,"                                                           )"
-89,TYPE,FUNC_DEF,PARENT_NOT_SET,61,61,63,1,0,0,0,"FORCE_SPACE,OLD_FCN_PARAMS",0,0,"                                                             c3"
-89,WORD,FUNC_DEF,PARENT_NOT_SET,64,64,67,1,0,0,0,"VAR_DEF,OLD_FCN_PARAMS",0,0,"                                                                c41"
-89,COMMA,FUNC_DEF,PARENT_NOT_SET,67,67,68,0,0,0,0,"OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                                   ,"
-89,PTR_TYPE,FUNC_DEF,PARENT_NOT_SET,69,69,70,1,0,0,0,"EXPR_START,OLD_FCN_PARAMS,LVALUE,PUNCTUATOR",0,0,"                                                                     *"
-89,WORD,FUNC_DEF,PARENT_NOT_SET,70,70,73,0,0,0,0,"EXPR_START,VAR_DEF,OLD_FCN_PARAMS,LVALUE",0,0,"                                                                      c42"
-89,ASSIGN,FUNC_DEF,PARENT_NOT_SET,74,74,75,1,0,0,0,"OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                                          ="
-89,WORD,FUNC_DEF,PARENT_NOT_SET,76,76,83,1,0,0,0,"EXPR_START,OLD_FCN_PARAMS",0,0,"                                                                            nullptr"
-89,COMMA,FUNC_DEF,PARENT_NOT_SET,83,83,84,0,0,0,0,"OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                                                   ,"
-89,DEREF,FUNC_DEF,PARENT_NOT_SET,85,85,86,1,0,0,0,"EXPR_START,OLD_FCN_PARAMS,LVALUE,PUNCTUATOR",0,0,"                                                                                     *"
-89,WORD,FUNC_DEF,PARENT_NOT_SET,86,86,89,0,0,0,0,"EXPR_START,OLD_FCN_PARAMS,LVALUE",0,0,"                                                                                      c43"
-89,TSQUARE,FUNC_DEF,PARENT_NOT_SET,89,89,91,0,0,0,0,"OLD_FCN_PARAMS,LVALUE,PUNCTUATOR",0,0,"                                                                                         []"
-89,ASSIGN,FUNC_DEF,PARENT_NOT_SET,92,92,93,1,0,0,0,"OLD_FCN_PARAMS,PUNCTUATOR",0,0,"                                                                                            ="
-89,BRACE_OPEN,FUNC_DEF,PARENT_NOT_SET,94,94,95,1,0,0,0,"IN_CLASS,EXPR_START,PUNCTUATOR",0,0,"                                                                                              {"
-89,NEWLINE,NONE,PARENT_NOT_SET,95,96,0,0,0,0,0,"IN_CLASS",1,0,
-89,WORD,NONE,PARENT_NOT_SET,9,96,103,1,1,1,0,"IN_CLASS,EXPR_START",0,0,"         nullptr"
-89,COMMA,NONE,PARENT_NOT_SET,16,103,104,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"                ,"
-89,WORD,NONE,PARENT_NOT_SET,18,105,112,1,1,1,0,"IN_CLASS,EXPR_START",0,0,"                  nullptr"
-89,NEWLINE,NONE,PARENT_NOT_SET,25,113,0,0,1,1,0,"IN_CLASS",1,0,
-89,BRACE_CLOSE,FUNC_DEF,PARENT_NOT_SET,1,113,114,1,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
-89,COMMA,NONE,PARENT_NOT_SET,2,114,115,0,0,0,0,"STMT_START,EXPR_START,PUNCTUATOR",0,0,"  ,"
-89,WORD,NONE,PARENT_NOT_SET,4,116,119,1,0,0,0,"EXPR_START,LVALUE",0,0,"    c44"
-89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,7,119,120,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"       {"
-89,NUMBER,NONE,PARENT_NOT_SET,9,121,122,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"         0"
-89,COMMA,NONE,PARENT_NOT_SET,10,122,123,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"          ,"
-89,NUMBER,NONE,PARENT_NOT_SET,12,124,125,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"            1"
-89,COMMA,NONE,PARENT_NOT_SET,13,125,126,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"             ,"
-89,NUMBER,NONE,PARENT_NOT_SET,15,127,128,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"               2"
-89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,16,128,129,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                }"
-89,COMMA,NONE,PARENT_NOT_SET,17,129,130,0,0,0,0,"PUNCTUATOR",0,0,"                 ,"
-89,DEREF,NONE,PARENT_NOT_SET,19,131,132,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                   *"
-89,QUALIFIER,NONE,PARENT_NOT_SET,20,133,138,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                    const"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,26,139,142,1,0,0,0,"",0,0,"                          c45"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,29,142,143,0,0,0,0,"PUNCTUATOR",0,0,"                             ("
-89,WORD,NONE,PARENT_NOT_SET,30,143,150,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                              nullptr"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,37,150,151,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                     )"
-89,COMMA,NONE,PARENT_NOT_SET,38,151,152,0,0,0,0,"PUNCTUATOR",0,0,"                                      ,"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,40,153,156,1,0,0,0,"EXPR_START",0,0,"                                        c46"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,43,156,157,0,0,0,0,"PUNCTUATOR",0,0,"                                           ("
-89,NUMBER,NONE,PARENT_NOT_SET,44,157,158,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                            0"
-89,COMMA,NONE,PARENT_NOT_SET,45,158,159,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                             ,"
-89,NUMBER,NONE,PARENT_NOT_SET,47,160,161,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                               1"
-89,COMMA,NONE,PARENT_NOT_SET,48,161,162,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                ,"
-89,NUMBER,NONE,PARENT_NOT_SET,50,163,164,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                  2"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,51,164,165,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                   )"
-89,SEMICOLON,NONE,PARENT_NOT_SET,52,165,166,0,0,0,0,"PUNCTUATOR",0,0,"                                                    ;"
-89,NEWLINE,NONE,PARENT_NOT_SET,53,166,1,0,0,0,0,"",2,0,
-91,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,68,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type : bases ... { } x, ..."
-91,NEWLINE,NONE,PARENT_NOT_SET,68,68,1,0,0,0,0,"",1,0,
-92,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
-92,TYPE,CLASS,PARENT_NOT_SET,7,7,14,1,0,0,0,"",0,0,"       ALIGNAS"
-92,PAREN_OPEN,CLASS,PARENT_NOT_SET,15,14,15,0,0,0,0,"PUNCTUATOR",0,0,"               ("
-92,NUMBER,NONE,PARENT_NOT_SET,16,15,16,0,0,1,0,"EXPR_START",0,0,"                4"
-92,PAREN_CLOSE,NONE,PARENT_NOT_SET,17,16,17,0,0,0,0,"PUNCTUATOR",0,0,"                 )"
-92,TYPE,CLASS,PARENT_NOT_SET,19,18,28,1,0,0,0,"FORCE_SPACE",0,0,"                   API_EXPORT"
-92,ATTRIBUTE,NONE,PARENT_NOT_SET,30,29,42,1,0,0,0,"",0,0,"                              __attribute__"
-92,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,43,42,43,0,0,0,0,"PUNCTUATOR",0,0,"                                           ("
-92,PAREN_OPEN,NONE,PARENT_NOT_SET,44,43,44,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                            ("
-92,WORD,NONE,PARENT_NOT_SET,45,44,58,0,0,2,0,"EXPR_START,LVALUE",0,0,"                                             __deprecated__"
-92,PAREN_CLOSE,NONE,PARENT_NOT_SET,59,58,59,0,0,1,0,"LVALUE,PUNCTUATOR",0,0,"                                                           )"
-92,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,60,59,60,0,0,0,0,"LVALUE,PUNCTUATOR",0,0,"                                                            )"
-92,NEWLINE,NONE,PARENT_NOT_SET,61,60,1,0,0,0,0,"",1,0,
-93,CLASS_COLON,NONE,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,LVALUE,PUNCTUATOR",0,0,"         :"
-93,QUALIFIER,NONE,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,LVALUE",0,0,"           public"
-93,TYPE,NONE,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE,VAR_TYPE,LVALUE",0,0,"                  outer_namespace"
-93,DC_MEMBER,NONE,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,LVALUE,PUNCTUATOR",0,0,"                                 ::"
-93,TYPE,NONE,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,LVALUE",0,0,"                                   inner_namespace"
-93,DC_MEMBER,NONE,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,VAR_TYPE,LVALUE,PUNCTUATOR",0,0,"                                                  ::"
-93,WORD,NONE,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE,VAR_DEF,VAR_1ST,LVALUE",0,0,"                                                    Base1"
-93,NEWLINE,NONE,PARENT_NOT_SET,57,49,1,0,0,0,0,"",1,0,
-94,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," {"
-94,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"",1,0,
-95,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
-95,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
-95,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"",1,0,
-96,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-96,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_x"
-96,SEMICOLON,CLASS,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-96,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"",1,0,
-97,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-97,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_y"
-97,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-97,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"",1,0,
-98,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
-98,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_z"
-98,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
-98,NEWLINE,NONE,PARENT_NOT_SET,9,12,1,0,1,1,0,"",1,0,
-99,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
-99,WORD,NONE,PARENT_NOT_SET,3,3,6,1,0,0,0,"STMT_START,EXPR_START",0,0,"   c51"
-99,COMMA,NONE,PARENT_NOT_SET,6,6,7,0,0,0,0,"PUNCTUATOR",0,0,"      ,"
-99,DEREF,NONE,PARENT_NOT_SET,8,8,9,1,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"        *"
-99,WORD,NONE,PARENT_NOT_SET,9,9,12,0,0,0,0,"EXPR_START,LVALUE",0,0,"         c52"
-99,ASSIGN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,0,"PUNCTUATOR",0,0,"             ="
-99,WORD,NONE,PARENT_NOT_SET,15,15,22,1,0,0,0,"EXPR_START",0,0,"               nullptr"
-99,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ,"
-99,DEREF,NONE,PARENT_NOT_SET,24,24,25,1,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                        *"
-99,WORD,NONE,PARENT_NOT_SET,25,25,28,0,0,0,0,"EXPR_START,LVALUE",0,0,"                         c53"
-99,TSQUARE,NONE,PARENT_NOT_SET,28,28,30,0,0,0,0,"LVALUE,PUNCTUATOR",0,0,"                            []"
-99,ASSIGN,NONE,PARENT_NOT_SET,31,31,32,1,0,0,0,"PUNCTUATOR",0,0,"                               ="
-99,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,33,33,34,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                 {"
-99,WORD,NONE,PARENT_NOT_SET,35,35,42,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                   nullptr"
-99,COMMA,NONE,PARENT_NOT_SET,42,42,43,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                          ,"
-99,WORD,NONE,PARENT_NOT_SET,44,44,51,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                            nullptr"
-99,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,52,52,53,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                    }"
-99,SEMICOLON,NONE,PARENT_NOT_SET,53,53,54,0,0,0,0,"PUNCTUATOR",0,0,"                                                     ;"
-99,NEWLINE,NONE,PARENT_NOT_SET,54,54,1,0,0,0,0,"",3,0,
-102,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,44,0,0,0,0,"",0,0," // enum type : integral_type { ... } x, ..."
-102,NEWLINE,NONE,PARENT_NOT_SET,44,44,1,0,0,0,0,"",1,0,
-103,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," enum"
-103,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"LVALUE",0,0,"      e1"
-103,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"LVALUE,PUNCTUATOR",0,0,"         :"
-103,TYPE,NONE,PARENT_NOT_SET,11,11,15,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,LVALUE",0,0,"           long"
-103,TYPE,NONE,PARENT_NOT_SET,16,16,20,1,0,0,0,"LVALUE",0,0,"                long"
-103,BRACE_OPEN,ENUM,PARENT_NOT_SET,21,21,22,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                     {"
-103,WORD,NONE,PARENT_NOT_SET,23,23,25,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                       a1"
-103,COMMA,NONE,PARENT_NOT_SET,25,25,26,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                         ,"
-103,WORD,NONE,PARENT_NOT_SET,27,27,29,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                           b1"
-103,COMMA,NONE,PARENT_NOT_SET,29,29,30,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                             ,"
-103,WORD,NONE,PARENT_NOT_SET,31,31,33,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                               d1"
-103,BRACE_CLOSE,ENUM,PARENT_NOT_SET,34,34,35,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                  }"
-103,WORD,NONE,PARENT_NOT_SET,36,36,39,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                    e11"
-103,COMMA,NONE,PARENT_NOT_SET,39,39,40,0,0,0,0,"PUNCTUATOR",0,0,"                                       ,"
-103,WORD,NONE,PARENT_NOT_SET,41,41,44,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                         e12"
-103,COMMA,NONE,PARENT_NOT_SET,44,44,45,0,0,0,0,"PUNCTUATOR",0,0,"                                            ,"
-103,WORD,NONE,PARENT_NOT_SET,46,46,49,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                              e13"
-103,SEMICOLON,ENUM,PARENT_NOT_SET,49,49,50,0,0,0,0,"PUNCTUATOR",0,0,"                                                 ;"
-103,NEWLINE,NONE,PARENT_NOT_SET,50,50,1,0,0,0,0,"",2,0,
-105,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,37,0,0,0,0,"",0,0," // enum type : integral_type { ... }"
-105,NEWLINE,NONE,PARENT_NOT_SET,37,37,1,0,0,0,0,"",1,0,
-106,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," enum"
-106,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"LVALUE",0,0,"      e2"
-106,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"LVALUE,PUNCTUATOR",0,0,"         :"
-106,TYPE,NONE,PARENT_NOT_SET,11,11,19,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,LVALUE",0,0,"           unsigned"
-106,TYPE,NONE,PARENT_NOT_SET,20,20,23,1,0,0,0,"LVALUE",0,0,"                    int"
-106,BRACE_OPEN,ENUM,PARENT_NOT_SET,24,24,25,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                        {"
-106,WORD,NONE,PARENT_NOT_SET,26,26,28,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                          a2"
-106,COMMA,NONE,PARENT_NOT_SET,28,28,29,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                            ,"
-106,WORD,NONE,PARENT_NOT_SET,30,30,32,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                              b2"
-106,COMMA,NONE,PARENT_NOT_SET,32,32,33,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                ,"
-106,WORD,NONE,PARENT_NOT_SET,34,34,36,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                  d2"
-106,BRACE_CLOSE,ENUM,PARENT_NOT_SET,37,37,38,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                     }"
-106,SEMICOLON,ENUM,PARENT_NOT_SET,38,38,39,0,0,0,0,"PUNCTUATOR",0,0,"                                      ;"
-106,NEWLINE,NONE,PARENT_NOT_SET,39,39,1,0,0,0,0,"",2,0,
-108,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,29,0,0,0,0,"",0,0," // enum type : integral_type"
-108,NEWLINE,NONE,PARENT_NOT_SET,29,29,1,0,0,0,0,"",1,0,
-109,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
-109,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"INCOMPLETE",0,0,"      e3"
-109,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
-109,TYPE,NONE,PARENT_NOT_SET,11,11,16,1,0,0,0,"STMT_START,EXPR_START",0,0,"           short"
-109,SEMICOLON,ENUM,PARENT_NOT_SET,16,16,17,0,0,0,0,"PUNCTUATOR",0,0,"                ;"
-109,NEWLINE,NONE,PARENT_NOT_SET,17,17,1,0,0,0,0,"",2,0,
-111,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,20,0,0,0,0,"",0,0," // enum type x, ..."
-111,NEWLINE,NONE,PARENT_NOT_SET,20,20,1,0,0,0,0,"",1,0,
-112,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
-112,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"FORCE_SPACE",0,0,"      e3"
-112,WORD,ENUM,PARENT_NOT_SET,9,9,12,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"         e31"
-112,COMMA,NONE,PARENT_NOT_SET,12,12,13,0,0,0,0,"PUNCTUATOR",0,0,"            ,"
-112,WORD,NONE,PARENT_NOT_SET,14,14,17,1,0,0,0,"EXPR_START,VAR_DEF",0,0,"              e32"
-112,SEMICOLON,ENUM,PARENT_NOT_SET,17,17,18,0,0,0,0,"PUNCTUATOR",0,0,"                 ;"
-112,NEWLINE,NONE,PARENT_NOT_SET,18,18,1,0,0,0,0,"",2,0,
-114,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,50,0,0,0,0,"",0,0," // enum class type : integral_type { ... } x, ..."
-114,NEWLINE,NONE,PARENT_NOT_SET,50,50,1,0,0,0,0,"",1,0,
-115,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," enum"
-115,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,LVALUE",0,0,"      class"
-115,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"LVALUE",0,0,"            e4"
-115,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"LVALUE,PUNCTUATOR",0,0,"               :"
-115,TYPE,NONE,PARENT_NOT_SET,17,17,21,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,LVALUE",0,0,"                 long"
-115,TYPE,NONE,PARENT_NOT_SET,22,22,26,1,0,0,0,"LVALUE",0,0,"                      long"
-115,BRACE_OPEN,ENUM,PARENT_NOT_SET,27,27,28,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                           {"
-115,WORD,NONE,PARENT_NOT_SET,29,29,31,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                             a4"
-115,COMMA,NONE,PARENT_NOT_SET,31,31,32,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                               ,"
-115,WORD,NONE,PARENT_NOT_SET,33,33,35,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                 b4"
-115,COMMA,NONE,PARENT_NOT_SET,35,35,36,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                   ,"
-115,WORD,NONE,PARENT_NOT_SET,37,37,39,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                     d4"
-115,BRACE_CLOSE,ENUM,PARENT_NOT_SET,40,40,41,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                        }"
-115,WORD,NONE,PARENT_NOT_SET,42,42,45,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                          e41"
-115,COMMA,NONE,PARENT_NOT_SET,45,45,46,0,0,0,0,"PUNCTUATOR",0,0,"                                             ,"
-115,WORD,NONE,PARENT_NOT_SET,47,47,50,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                               e42"
-115,COMMA,NONE,PARENT_NOT_SET,50,50,51,0,0,0,0,"PUNCTUATOR",0,0,"                                                  ,"
-115,WORD,NONE,PARENT_NOT_SET,52,52,55,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                    e43"
-115,COMMA,NONE,PARENT_NOT_SET,55,55,56,0,0,0,0,"PUNCTUATOR",0,0,"                                                       ,"
-115,WORD,NONE,PARENT_NOT_SET,57,57,60,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                         e44"
-115,SEMICOLON,ENUM,PARENT_NOT_SET,60,60,61,0,0,0,0,"PUNCTUATOR",0,0,"                                                            ;"
-115,NEWLINE,NONE,PARENT_NOT_SET,61,61,1,0,0,0,0,"",2,0,
-117,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,43,0,0,0,0,"",0,0," // enum class type : integral_type { ... }"
-117,NEWLINE,NONE,PARENT_NOT_SET,43,43,1,0,0,0,0,"",1,0,
-118,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," enum"
-118,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,LVALUE",0,0,"      class"
-118,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"LVALUE",0,0,"            e5"
-118,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"LVALUE,PUNCTUATOR",0,0,"               :"
-118,TYPE,NONE,PARENT_NOT_SET,17,17,25,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,LVALUE",0,0,"                 unsigned"
-118,TYPE,NONE,PARENT_NOT_SET,26,26,29,1,0,0,0,"LVALUE",0,0,"                          int"
-118,BRACE_OPEN,ENUM,PARENT_NOT_SET,30,30,31,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                              {"
-118,WORD,NONE,PARENT_NOT_SET,32,32,34,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                                a5"
-118,COMMA,NONE,PARENT_NOT_SET,34,34,35,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                  ,"
-118,WORD,NONE,PARENT_NOT_SET,36,36,38,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                    b5"
-118,COMMA,NONE,PARENT_NOT_SET,38,38,39,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                      ,"
-118,WORD,NONE,PARENT_NOT_SET,40,40,42,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                        d5"
-118,BRACE_CLOSE,ENUM,PARENT_NOT_SET,43,43,44,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                           }"
-118,SEMICOLON,ENUM,PARENT_NOT_SET,44,44,45,0,0,0,0,"PUNCTUATOR",0,0,"                                            ;"
-118,NEWLINE,NONE,PARENT_NOT_SET,45,45,1,0,0,0,0,"",2,0,
-120,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,35,0,0,0,0,"",0,0," // enum class type : integral_type"
-120,NEWLINE,NONE,PARENT_NOT_SET,35,35,1,0,0,0,0,"",1,0,
-121,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
-121,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"      class"
-121,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"INCOMPLETE",0,0,"            e6"
-121,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
-121,TYPE,NONE,PARENT_NOT_SET,17,17,22,1,0,0,0,"STMT_START,EXPR_START",0,0,"                 short"
-121,SEMICOLON,ENUM,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ;"
-121,NEWLINE,NONE,PARENT_NOT_SET,23,23,1,0,0,0,0,"",2,0,
-123,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,19,0,0,0,0,"",0,0," // enum class type"
-123,NEWLINE,NONE,PARENT_NOT_SET,19,19,1,0,0,0,0,"",1,0,
-124,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
-124,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"      class"
-124,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"INCOMPLETE",0,0,"            e7"
-124,SEMICOLON,ENUM,PARENT_NOT_SET,14,14,15,0,0,0,0,"PUNCTUATOR",0,0,"              ;"
-124,NEWLINE,NONE,PARENT_NOT_SET,15,15,1,0,0,0,0,"",2,0,
-126,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,39,0,0,0,0,"",0,0," // enum : integral_type { ... } x, ..."
-126,NEWLINE,NONE,PARENT_NOT_SET,39,39,1,0,0,0,0,"",1,0,
-127,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"STMT_START,EXPR_START,LVALUE",0,0," enum"
-127,BIT_COLON,ENUM,PARENT_NOT_SET,6,6,7,1,0,0,0,"LVALUE,PUNCTUATOR",0,0,"      :"
-127,TYPE,NONE,PARENT_NOT_SET,8,8,12,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,LVALUE",0,0,"        long"
-127,TYPE,NONE,PARENT_NOT_SET,13,13,17,1,0,0,0,"LVALUE",0,0,"             long"
-127,BRACE_OPEN,ENUM,PARENT_NOT_SET,18,18,19,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                  {"
-127,WORD,NONE,PARENT_NOT_SET,20,20,22,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                    a8"
-127,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                      ,"
-127,WORD,NONE,PARENT_NOT_SET,24,24,26,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                        b8"
-127,COMMA,NONE,PARENT_NOT_SET,26,26,27,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                          ,"
-127,WORD,NONE,PARENT_NOT_SET,28,28,30,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                            c8"
-127,BRACE_CLOSE,ENUM,PARENT_NOT_SET,31,31,32,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                               }"
-127,WORD,NONE,PARENT_NOT_SET,33,33,36,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                 e81"
-127,COMMA,NONE,PARENT_NOT_SET,36,36,37,0,0,0,0,"PUNCTUATOR",0,0,"                                    ,"
-127,WORD,NONE,PARENT_NOT_SET,38,38,41,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                      e82"
-127,SEMICOLON,ENUM,PARENT_NOT_SET,41,41,42,0,0,0,0,"PUNCTUATOR",0,0,"                                         ;"
-127,NEWLINE,NONE,PARENT_NOT_SET,42,42,1,0,0,0,0,"",2,0,
-129,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,23,0,0,0,0,"",0,0," // enum { ... } x, ..."
-129,NEWLINE,NONE,PARENT_NOT_SET,23,23,1,0,0,0,0,"",1,0,
-130,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"STMT_START,EXPR_START",0,0," enum"
-130,BRACE_OPEN,ENUM,PARENT_NOT_SET,6,6,7,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"      {"
-130,WORD,NONE,PARENT_NOT_SET,8,8,10,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"        a9"
-130,COMMA,NONE,PARENT_NOT_SET,10,10,11,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"          ,"
-130,WORD,NONE,PARENT_NOT_SET,12,12,14,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"            b9"
-130,COMMA,NONE,PARENT_NOT_SET,14,14,15,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"              ,"
-130,WORD,NONE,PARENT_NOT_SET,16,16,18,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                c9"
-130,BRACE_CLOSE,ENUM,PARENT_NOT_SET,19,19,20,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                   }"
-130,WORD,NONE,PARENT_NOT_SET,21,21,24,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                     e91"
-130,COMMA,NONE,PARENT_NOT_SET,24,24,25,0,0,0,0,"PUNCTUATOR",0,0,"                        ,"
-130,WORD,NONE,PARENT_NOT_SET,26,26,29,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                          e92"
-130,SEMICOLON,ENUM,PARENT_NOT_SET,29,29,30,0,0,0,0,"PUNCTUATOR",0,0,"                             ;"
-130,NEWLINE,NONE,PARENT_NOT_SET,30,30,1,0,0,0,0,"",2,0,
-132,UNION,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,LVALUE",0,0," union"
-132,TYPE,UNION,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE,LVALUE",0,0,"       API_EXPORT"
-132,WORD,UNION,PARENT_NOT_SET,18,18,20,1,0,0,0,"VAR_DEF,VAR_1ST,LVALUE",0,0,"                  u1"
-132,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,21,21,22,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                     {"
-132,TYPE,NONE,PARENT_NOT_SET,23,23,26,1,1,1,0,"FORCE_SPACE,STMT_START,EXPR_START,ONE_LINER",0,0,"                       int"
-132,WORD,NONE,PARENT_NOT_SET,27,27,28,1,1,1,0,"ONE_LINER",0,0,"                           x"
-132,SEMICOLON,UNION,PARENT_NOT_SET,28,28,29,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                            ;"
-132,TYPE,NONE,PARENT_NOT_SET,30,30,34,1,1,1,0,"FORCE_SPACE,STMT_START,EXPR_START,ONE_LINER",0,0,"                              long"
-132,WORD,NONE,PARENT_NOT_SET,35,35,36,1,1,1,0,"ONE_LINER",0,0,"                                   y"
-132,SEMICOLON,NONE,PARENT_NOT_SET,36,36,37,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                    ;"
-132,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,38,38,39,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                      }"
-132,WORD,NONE,PARENT_NOT_SET,40,40,43,1,0,0,0,"",0,0,"                                        u11"
-132,COMMA,NONE,PARENT_NOT_SET,43,43,44,0,0,0,0,"PUNCTUATOR",0,0,"                                           ,"
-132,DEREF,NONE,PARENT_NOT_SET,45,45,46,1,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                                             *"
-132,WORD,NONE,PARENT_NOT_SET,46,46,49,0,0,0,0,"EXPR_START,LVALUE",0,0,"                                              u12"
-132,ASSIGN,NONE,PARENT_NOT_SET,50,50,51,1,0,0,0,"PUNCTUATOR",0,0,"                                                  ="
-132,WORD,NONE,PARENT_NOT_SET,52,52,59,1,0,0,0,"EXPR_START",0,0,"                                                    nullptr"
-132,COMMA,NONE,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           ,"
-132,DEREF,NONE,PARENT_NOT_SET,61,61,62,1,0,0,0,"EXPR_START,LVALUE,PUNCTUATOR",0,0,"                                                             *"
-132,WORD,NONE,PARENT_NOT_SET,62,62,65,0,0,0,0,"EXPR_START,LVALUE",0,0,"                                                              u13"
-132,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,65,65,66,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                 {"
-132,NUMBER,NONE,PARENT_NOT_SET,66,66,67,0,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                                  0"
-132,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,67,67,68,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                   }"
-132,SEMICOLON,NONE,PARENT_NOT_SET,68,68,69,0,0,0,0,"PUNCTUATOR",0,0,"                                                                    ;"
-132,NEWLINE,NONE,PARENT_NOT_SET,69,69,1,0,0,0,0,"",2,0,
-134,UNION,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," union"
-134,TYPE,UNION,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
-134,TYPE,UNION,PARENT_NOT_SET,18,18,20,1,0,0,0,"FORCE_SPACE",0,0,"                  u1"
-134,WORD,NONE,PARENT_NOT_SET,21,21,24,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                     u21"
-134,SEMICOLON,UNION,PARENT_NOT_SET,24,24,25,0,0,0,0,"PUNCTUATOR",0,0,"                        ;"
-134,NEWLINE,NONE,PARENT_NOT_SET,25,25,1,0,0,0,0,"",1,0,
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_off_after_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_off_after_return.cfg
deleted file mode 100644
index 6da4edac..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_off_after_return.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-indent_off_after_return = true
-indent_off_after_return_new = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst-r.cfg
deleted file mode 100644
index 83393a62..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_type_brace_init_lst          = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_decltype-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_decltype-f.cfg
deleted file mode 100644
index 1a8651b4..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_decltype-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_decltype               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-f.cfg
deleted file mode 100644
index d7104cc7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-r.cfg
deleted file mode 100644
index 6aaf6389..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-r.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_after_type                   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_comma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_comma.cfg
deleted file mode 100644
index 2c160ba6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_comma.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add or remove space between an open paren and comma: '(,' vs '( ,'. Default=Force.
-sp_paren_comma = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30114-bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30114-bug_1462.cpp
deleted file mode 100644
index 312c7e42..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30114-bug_1462.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <type_traits>
-
-template <
-	typename ... Args,
-	typename E = typename std::enable_if<(sizeof...(Args) >= 1), bool>::type
-	>
-void fun1(Args&& ... args)
-{
-}
-
-template <
-	typename ... Args,
-	typename E = typename std::enable_if<(sizeof...(Args) > 1), bool>::type
-	>
-void fun2(Args&& ... args)
-{
-}
-
-template <
-	typename ... Args,
-	typename E = typename std::enable_if<(sizeof...(Args) < 3), bool>::type
-	>
-void fun3(Args&& ... args)
-{
-}
-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30944-sp_paren_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30944-sp_paren_comma.cpp
deleted file mode 100644
index 24f840c0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30944-sp_paren_comma.cpp
+++ /dev/null
@@ -1 +0,0 @@
-a(, 1);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
deleted file mode 100644
index 80812f5c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void func() {
-}
-
-// **ABC**
-void func() { }
-// *INDENT-ON*
-
-void func() {
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34180-bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34180-bug_1402.cpp
deleted file mode 100644
index 44a8ec74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34180-bug_1402.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Constants
-{
-double PI = 3.14;
-}
-int factor = 41;
-double result = Constants::PI * factor;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34280-UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34280-UNI-29935.cpp
deleted file mode 100644
index 28d0b66d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34280-UNI-29935.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void Foo1(BarType & x, void BarFunc());
-
-void Bar()
-{
-    void BarFunc2(BarType & x);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10018-delete-space-oc.mm
deleted file mode 100644
index 720d14cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10018-delete-space-oc.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* EditorApplication */

-

-#include <string>

-

-#ifdef __OBJC__

-#import <Cocoa/Cocoa.h>

-

-class HierarchyState;

-@interface EditorApplication : NSObject

-{

-	IBOutlet id m_MainWindow;

-	IBOutlet id m_PaneController;

-	id m_RenderTimer;

-

-	IBOutlet id m_CutItem;

-	IBOutlet id m_CopyItem;

-	IBOutlet id m_PasteItem;

-

-	IBOutlet id m_DuplicateItem;

-	IBOutlet id m_DeleteItem;

-

-	IBOutlet id m_FrameSelectedItem;

-	IBOutlet id m_FindItem;

-	IBOutlet id m_SelectAllItem;

-}

-

-- (IBAction)SaveAssets:(id)sender;

-- (IBAction)CloseScene:(id)sender;

-- (IBAction)NewProject:(id)sender;

-- (IBAction)OpenProject:(id)sender;

-

-- (IBAction)SaveAsSceneToDisk:(id)sender;

-

-- (IBAction)EnterSerialNumber:(id)sender;

-- (IBAction)ReturnLicense:(id)sender;

-- (IBAction)CompileScene:(id)sender;

-- (IBAction)CompileSceneAutomatic:(id)sender;

-

-- (IBAction)saveDocument:(id)sender;

-

-- (IBAction)LoadSceneFromDisk:(id)sender;

-

-- (void)RemoveDisplayTimer;

-- (void)RegisterUpdateTimer:(int)frequency;

-

-- (void)refreshModifiedFile:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-- (void)closeFile:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-

-- (IBAction)ShowAboutDialog:(id)sender;

-- (IBAction)ShowPreferences:(id)sender;

-- (IBAction)ShowPackageManager:(id)sender;

-

-- (IBAction) delete:(id)sender;

-- (IBAction) copy:(id)action;

-- (IBAction)paste:(id)action;

-- (IBAction)duplicate:(id)action;

-- (IBAction)cut:(id)action;

-- (IBAction)selectAll:(id)action;

-- (IBAction)find:(id)action;

-- (IBAction)frameSelected:(id)action;

-- (IBAction)frameSelectedWithLock:(id)action;

-

-// Assetstore protocol handler and registration

-- (void)registerAssetStoreURLProtocol;

-- (void)getUrl:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent;

-

-@end

-

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1402.cpp
deleted file mode 100644
index 44a8ec74..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1402.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Constants
-{
-double PI = 3.14;
-}
-int factor = 41;
-double result = Constants::PI * factor;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_off_after_return.cpp
deleted file mode 100644
index 534d0ebe..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_off_after_return.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-int foo1()
-{
-	return std::pair<int, int>{
-		1, 2
-		}.first;
-}
-
-int foo2()
-{
-	return
-	 int{3} & 2;
-}
-
-int foo3()
-{
-	constexpr static int x = 3;
-	return
-	 decltype(x){x} & 2;
-}
-
-int foo4()
-{
-	return
-	new Type();
-}
-
-int foo5()
-{
-	return
-	veryLongMethodCall(
-		arg1,
-		longMethodCall(
-			methodCall(
-				arg2, arg3
-			), arg4
-		)
-	);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_paren_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_paren_comma.cpp
deleted file mode 100644
index 1d687146..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_paren_comma.cpp
+++ /dev/null
@@ -1 +0,0 @@
-a( , 1);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/toggle_processing_cmt.cpp
deleted file mode 100644
index 304f0eae..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/toggle_processing_cmt.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void func() { }
-
-// **ABC**
-void func() { }
-// *INDENT-ON*
-
-void func() { }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.editorconfig
index 3942fe21..3942fe21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.editorconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.gitattributes b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitattributes
index 5ef989a3..5ef989a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.gitattributes
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitattributes
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.github/ISSUE_TEMPLATE b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/ISSUE_TEMPLATE
index d98e5cf5..d98e5cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.github/ISSUE_TEMPLATE
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/ISSUE_TEMPLATE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/workflows/uncrustify_test.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/workflows/uncrustify_test.yml
new file mode 100644
index 00000000..8d2198ab
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.github/workflows/uncrustify_test.yml
@@ -0,0 +1,32 @@
+---
+
+name: uncrustify_test
+on: [push]
+jobs:
+  check-uncrustify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: cmake-part-and-tests
+        env:
+          BADGE: linux
+        run: mkdir build;
+          cd build;
+          cmake -DCMAKE_BUILD_TYPE=Release ..;
+          make;
+          ../scripts/run_ctest.py
+
+
+  debug-ninja-uncrustify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - name: cmake-part-and-tests
+        env:
+          BADGE: linux
+        run: mkdir build;
+          cd build;
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..;
+          ninja;
+          ../scripts/run_ctest.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.gitignore b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitignore
index 1bf76cd9..9fb21e7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.gitignore
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.gitignore
@@ -1,6 +1,9 @@
 # "Default" build tree
 /build/
 
+# PyCharm help directory
+venv/
+
 # Compiled Python code
 *.pyc
 
@@ -56,3 +59,6 @@ xcuserdata
 # CLion
 .idea/
 cmake-build-*/
+
+# Vim
+*.swp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.travis.yml
index f79e7c83..a3bfcf7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/.travis.yml
@@ -3,16 +3,6 @@ sudo: false
 
 matrix:
   include:
-    # keep a test with old ubuntu version, xenial 16
-    # 1
-    - os: linux
-      dist: Xenial
-      env: BADGE=linux BUILD_TYPE=debug
-      addons:
-        apt:
-          update: true
-          packages:
-            - ninja-build
 
     # bionic 18
     # 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/AUTHORS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/AUTHORS
index 54479353..4a565037 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/AUTHORS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/AUTHORS
@@ -16,15 +16,20 @@ Anirban Pramanick
 Antti Tapaninen
 Arne Forlie
 Arseniy Shestakov
+asobhy
+atauzki
 Aurélien Gâteau
 Benio
 Ben Iofel
 Ben Mayo
 Beren Minor
+Biswa96
+Biswapriyo Nath
 B. Kevin Hardman
 Bogdan Popescu
 Brandon Slack
 Brendan Long
+CharlieYJH
 Chris Lalancette
 Clemens Rabe
 Code Able
@@ -34,6 +39,7 @@ Daniel Chumak
 Dan Rose
 Dave Lee
 David Catmull
+David E. O'Brien
 David Lechner
 David Schaefgen
 Dirk Thomas
@@ -42,6 +48,7 @@ Dmitry Marakasov
 Dmitry Povolotsky
 Dmytro Povolotskyi
 Dženan Zukić
+Eism
 Emerson Knapp
 Emmanuel Christophe
 Ethan Gao
@@ -51,6 +58,7 @@ Ger Hobbelt
 Hackerpilot
 Hannes Schmidt
 Huang-Ming Huang
+Husk3r
 Ilya Lyubimov
 Ingo Brückl
 Ivan Nazarenko
@@ -58,6 +66,7 @@ Ivan Romanov
 Jakub Schmidtke
 Jan Weiß
 Jason
+JavDevGames
 Jeremy H
 Jeremy T Hilliker
 Jim Meyering
@@ -89,22 +98,27 @@ Matthew McDole
 Matthew Woehlke
 Maxim Mikityanskiy
 Max Smolens
+MeXx
 Michaël Peeters
+Michele Calgaro
 Mihai Popescu
 Mike
 Mike Gelfand
 Mirko König
 MrTheMake
 Nate
+neok-m4700
 Nico Decker
 Oleg Liatte
 Oleg Smolsky
 Owen Rudge
 Pat Notz
 Patrick Rohr
+Paul Cercueil
 Paul Smith
 Pavel Geiger
 Pawel Benetkiewicz
+Paweł Benetkiewicz
 PerfectCarl
 Peter Bruin
 Peter Hartley
@@ -118,21 +132,27 @@ RaveTheTadpole
 Roland Schulz
 Ryan Maxwell
 Samish Chandra Kolli
+Samish Kolli
 Scott Bilas
+Sebastian Andersson
 S. Gilles
 Shazron Abdullah
 Siddharth Kannan
+Spark-NF
 Stefan Koch
 Stefan Nunninger
 Stephen Gilles
 Steven Lee
 Suhaib Ishaque
+t-bltg
 Tim Hütz
 Timotheus Pokorra
 Todd Richmond
 Twigz
+U-RDEC\ParkerJS
 Vadim Zeitlin
 Viktor Kireev
 Vincent Rouillé
 Vyacheslav Shegai
 Waldir Pimenta
+Yannick Bühler
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/BUGS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/BUGS
index a6e2ccaa..a6e2ccaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/BUGS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/BUGS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CMakeLists.txt
index 38319265..c66fb661 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CMakeLists.txt
@@ -17,7 +17,8 @@ include(CheckCXXSymbolExists)
 include(CheckTypeSize)
 include(CTest)
 
-find_package(PythonInterp REQUIRED)
+find_package(Python3 REQUIRED)
+set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
 
 #
 # Check compiler flags
@@ -130,7 +131,7 @@ endif()
 # Generate uncrustify_version.h
 #
 
-set(UNCRUSTIFY_VERSION "0.72.0_f")
+set(UNCRUSTIFY_VERSION "0.73.0_f")
 
 option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
 if(NoGitVersionString)
@@ -259,12 +260,12 @@ set(uncrustify_sources
   src/backup.cpp
   src/brace_cleanup.cpp
   src/braces.cpp
+  src/calculate_closing_brace_position.cpp
   src/chunk_list.cpp
   src/ChunkStack.cpp
   src/combine.cpp
   src/combine_fix_mark.cpp
   src/combine_labels.cpp
-#  src/combine_mark.cpp
   src/combine_tools.cpp
   src/combine_skip.cpp
   src/compat_posix.cpp
@@ -272,11 +273,12 @@ set(uncrustify_sources
   src/cs_top_is_question.cpp
   src/detect.cpp
   src/enum_cleanup.cpp
+  src/EnumStructUnionParser.cpp
+  src/EnumStructUnionParser.h
   src/flag_braced_init_list.cpp
   src/flag_decltype.cpp
   src/flag_parens.cpp
   src/frame_list.cpp
-#  src/handle_oc.cpp
   src/indent.cpp
   src/keywords.cpp
   src/lang_pawn.cpp
@@ -290,6 +292,7 @@ set(uncrustify_sources
   src/options_for_QT.cpp
   src/output.cpp
   src/parens.cpp
+  src/parent_for_pp.cpp
   src/ParseFrame.cpp
   src/pcf_flags.cpp
   src/punctuators.cpp
@@ -313,6 +316,7 @@ set(uncrustify_sources
 )
 
 set(uncrustify_headers
+  src/add_space_table.h
   src/align_add.h
   src/align_asm_colon.h
   src/align_assign.h
@@ -341,13 +345,13 @@ set(uncrustify_headers
   src/base_types.h
   src/brace_cleanup.h
   src/braces.h
+  src/calculate_closing_brace_position.h
   src/char_table.h
   src/chunk_list.h
   src/ChunkStack.h
   src/combine.h
   src/combine_fix_mark.h
   src/combine_labels.h
-#  src/combine_mark.h
   src/combine_skip.h
   src/combine_tools.h
   src/compat.h
@@ -360,7 +364,6 @@ set(uncrustify_headers
   src/flag_decltype.h
   src/flag_parens.h
   src/frame_list.h
-#  src/handle_oc.h
   src/indent.h
   src/keywords.h
   src/lang_pawn.h
@@ -377,6 +380,7 @@ set(uncrustify_headers
   src/options.h
   src/output.h
   src/parens.h
+  src/parent_for_pp.h
   src/ParseFrame.h
   src/pcf_flags.h
   src/prototypes.h
@@ -499,7 +503,7 @@ include(CPack)
 #
 # Install
 #
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+if(MSVC)
   install(TARGETS uncrustify DESTINATION ".")
   install(FILES ${uncrustify_docs}
     DESTINATION "."
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/CODEOWNERS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CODEOWNERS
index b8b9012f..b8b9012f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/CODEOWNERS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CODEOWNERS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/CONTRIBUTING.md b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CONTRIBUTING.md
index ff77dfd5..10f62999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/CONTRIBUTING.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/CONTRIBUTING.md
@@ -81,6 +81,14 @@ There are lots of ways to contribute to Uncrustify:
       (a rephrasing of the branch name if set correctly).
     - The PR description should document the _why_ the change needed to be done
       and not _how_, which should be obvious by doing the code review.
+    - After commiting a new PR, one may have a look to the results, running under other OS:
+        https://travis-ci.com/
+          Sign in
+            SIGN IN WITH GITHUB
+            you get a view of  <your github account> / uncrustify
+
+        https://coveralls.io/github/uncrustify/uncrustify
+
 
 [master]: https://github.com/uncrustify/uncrustify/tree/master
 [commits]: https://chris.beams.io/posts/git-commit/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/COPYING b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/COPYING
index d60c31a9..d60c31a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/COPYING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/COPYING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/ChangeLog b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/ChangeLog
index 9788ec7f..1aedad53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/ChangeLog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/ChangeLog
@@ -1,3 +1,28 @@
+Change highlights in uncrustify-0.73.0 (May 2021)
+-------------------------------------------------------------------------------
+
+  b514f25120b12db7b1ca57cdb93dd929a5bf43c4
+    Added   : indent_before_class_colon            Nov 16 2020
+  39c969b69663f6e6cee9673e23d349a308edc44a
+    Added   : sp_cmt_cpp_region                    Dec  9 2020
+  9ca37d0c32729570de2e51c97338bc567e124ae3
+    Added   : cmt_sp_before_doxygen_javadoc_tags   Dec 24 2020
+    Added   : cmt_align_doxygen_javadoc_tags       Dec 24 2020
+  84e2c750d19b47bbe2547141b092855ec1f64424
+    Added   : cmt_reflow_fold_regex_file           Dec 24 2020
+  3a8e33a12839ca3bac2e1e0b49eb279362a2ab89
+    Added   : processing_cmt_as_regex              Dec 31 2020
+  c622135751824705979d37681fe16d9a60e3d77a
+    Added   : cmt_reflow_indent_to_paragraph_start Jan  9 2021
+  9c0799aa096b68550507980a32a529099caf97c5
+    Added   : sp_cpp_lambda_argument_list          Jan 19 2021
+  02054b1085166903e8c1384308ac7922cb57bd59
+    Added   : nl_do_leave_one_liners               Jan 29 2021
+  6a4d27914fca0c64273fad979355e16021626f8a
+    Added   : debug_truncate                       Feb  7 2021
+  a711e96ef7be6afc9f014c4c7e1e5ea5347aad0d
+    Added   : indent_comma_brace                   Mar  9 2021
+
 Change highlights in uncrustify-0.72.0 (November 2020)
 -------------------------------------------------------------------------------
   new command option:
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/Comments.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/Comments.txt
index 5375e829..5375e829 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/Comments.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/Comments.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/HELP b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/HELP
index 83792fa5..83792fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/HELP
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/HELP
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/LIMITATIONS.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/LIMITATIONS.txt
index a49f23f2..a49f23f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/LIMITATIONS.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/LIMITATIONS.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/NEWS b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/NEWS
index 8b6344a0..8b6344a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/NEWS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/NEWS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/README.md
index 54d3ea83..6a3df72f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/README.md
@@ -11,7 +11,7 @@
 A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA
 
 ## Features
-* Highly configurable - 742 configurable options as of version 0.72.0
+* Highly configurable - 753 configurable options as of version 0.73.0
 - <details><summary>add/remove spaces</summary>
 
   - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._
@@ -171,7 +171,7 @@ The configuration file `testConfigFileName` has to be located inside `tests/conf
 the input file `testInputFileName` inside `tests/input/<testSetName>/`,
 and expected results file inside the `tests/expected/<testSetName>/`
 directory.
-Expected results have the following naming convention: `testNr-testConfigFileName`.
+Expected results have the following naming convention: `testNr-testInputFileName`.
 
 Optionally a `!` can follow the `testNr` to enable a custom rerun
 configuration.
@@ -322,7 +322,7 @@ $ uncrustify -h
 Uncrustify usually reads configuration files that are passed via the `-c`
 flag. If the flag is not provided Uncrustify will try to find a
 configuration file via the `UNCRUSTIFY_CONFIG` environment variable or a
-file with the name `uncrustify` or `.uncrustify` in your home folder.
+file with the name `.uncrustify.cfg` or `uncrustify.cfg` in your home folder.
 
 To get a list of:
 - all available options use:
@@ -372,3 +372,6 @@ as uncrustify exits.
 You can open the command prompt (which is an interactive terminal
 window that allows you to run commands without it closing as soon as
 they exit) and run uncrustify.exe there.
+
+## Using uncrustify with vim
+Have a look [here]https://github.com/cofyc/vim-uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/TESTING b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/TESTING
index 63efbff7..63efbff7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/TESTING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/TESTING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/appveyor.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/appveyor.yml
index f4845638..e5c01aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/appveyor.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/appveyor.yml
@@ -25,7 +25,7 @@ before_build:
   - cd c:\projects\uncrustify
   - mkdir build
   - cd build
-  - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DUNCRUSTIFY_SEPARATE_TESTS=ON -G "%GENERATOR%" ..
+  - cmake -DUNCRUSTIFY_SEPARATE_TESTS=ON -G "%GENERATOR%" ..
 build_script:
   - cmake --build . --config %CONFIGURATION%
 test_script:
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/CodeCoverage.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/CodeCoverage.cmake
index 670c5144..670c5144 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/CodeCoverage.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/CodeCoverage.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/GenerateTokenNames.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateTokenNames.cmake
index 02a6241a..02a6241a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/GenerateTokenNames.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateTokenNames.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/GenerateVersionHeader.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateVersionHeader.cmake
index 3d6d376b..3d6d376b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/GenerateVersionHeader.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/GenerateVersionHeader.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/Toolchain-mingw32.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw32.cmake
index badd6994..badd6994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/Toolchain-mingw32.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw32.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/Toolchain-mingw64.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw64.cmake
index 399cc26b..399cc26b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/cmake/Toolchain-mingw64.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/cmake/Toolchain-mingw64.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/commit.log b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/commit.log
index 1a725f4e..1a725f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/commit.log
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/commit.log
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/coverity.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.sh
index e52a3594..e52a3594 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/coverity.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/coverity.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.travis.yml
index ef306e8c..ef306e8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/coverity.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/coverity.travis.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/debian-tde.mk b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/debian-tde.mk
new file mode 100644
index 00000000..f36e3527
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+	touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+                         sed -e "s|.*version ||" -e "s| .*||" | \
+                         xargs -r dpkg --compare-versions 1.17.0 lt \
+                         && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+    --with-qt-dir=/usr/share/qt3 \
+    --disable-rpath \
+    --with-xinerama \
+    $(cdbs_kde_enable_final) \
+    $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+	$(MAKE) -f admin/Makefile.common dist
+endif
+	debian/rules clean
+
+.tdepkginfo:
+	echo "# TDE package information" >.tdepkginfo
+	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+	# update multi-arch path in install files
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
+	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+	done
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+	# revert multi-arch path in install files
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
+	    [ ! -f $$a.arch ] || \
+	    mv $$a.arch $$a; \
+	done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/versions.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/versions.pl
new file mode 100644
index 00000000..1b110f7a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog
index de5b18ae..d6fe2c39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog
@@ -1,3 +1,9 @@
+uncrustify-trinity (0.73.0-0debian11.0.0+0) unstable; urgency=medium
+
+  * TDE version of upstream 0.73.0
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Wed, 19 May 2021 15:58:50 +0900
+
 uncrustify-trinity (0.72.0-0debian11.0.0+8) unstable; urgency=medium
 
   * Switch to build using ninja-build
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/compat b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/compat
index ec635144..ec635144 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/compat
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/compat
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/control
index c0391c70..97a69cb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/control
@@ -2,11 +2,9 @@ Source: uncrustify-trinity
 Section: deps-r14/devel
 Priority: optional
 Maintainer: Alexander GQ Gerasiov <gq@debian.org>
-Build-Depends: debhelper (>= 9~), cmake (>= 3.0~), ninja-build, python3 (>= 3.3~), gcc (>= 4:4.9~)
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.0~), ninja-build, python3 (>= 3.3~), gcc (>= 4:4.9~)
 Standards-Version: 4.5.0
 Homepage: https://github.com/uncrustify/uncrustify
-Vcs-Git: https://salsa.debian.org/debian/uncrustify.git
-Vcs-Browser: https://salsa.debian.org/debian/uncrustify
 
 Package: uncrustify-trinity
 Architecture: any
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/copyright b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/copyright
index 7c74f673..7c74f673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/copyright
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/copyright
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/docs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/docs
index d217a928..d217a928 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/docs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/docs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/001_docs-remove-remote-images.patch b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/001_docs-remove-remote-images.patch
index 9c7d3e3b..9c7d3e3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/001_docs-remove-remote-images.patch
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/001_docs-remove-remote-images.patch
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/002_trinity_customization.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/002_trinity_customization.diff
index 2c5eeb89..f9de3615 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/002_trinity_customization.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/002_trinity_customization.diff
@@ -9,7 +9,7 @@ Customize and repackage as a TDE package.
  
  if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
    message(FATAL_ERROR "
-@@ -231,7 +231,7 @@
+@@ -232,7 +232,7 @@
  #
  # Uncrustify
  #
@@ -18,16 +18,16 @@ Customize and repackage as a TDE package.
    src/align_add.cpp
    src/align_asm_colon.cpp
    src/align_assign.cpp
-@@ -312,7 +312,7 @@
+@@ -315,7 +315,7 @@
    ${PROJECT_BINARY_DIR}/src/option_enum.cpp
  )
  
 -set(uncrustify_headers
 +set(uncrustify-trinity_headers
+   src/add_space_table.h
    src/align_add.h
    src/align_asm_colon.h
-   src/align_assign.h
-@@ -404,7 +404,7 @@
+@@ -408,7 +408,7 @@
    ${PROJECT_BINARY_DIR}/uncrustify_version.h
  )
  
@@ -36,7 +36,7 @@ Customize and repackage as a TDE package.
    "${PROJECT_SOURCE_DIR}/AUTHORS"
    "${PROJECT_SOURCE_DIR}/BUGS"
    "${PROJECT_SOURCE_DIR}/ChangeLog"
-@@ -413,31 +413,31 @@
+@@ -417,31 +417,31 @@
    "${PROJECT_SOURCE_DIR}/README.md"
  )
  
@@ -75,7 +75,7 @@ Customize and repackage as a TDE package.
  
  #
  # Generate uncrustify.xml (katepart highlighting file)
-@@ -459,7 +459,7 @@
+@@ -463,7 +463,7 @@
  #
  OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
  if(ENABLE_CODECOVERAGE)
@@ -84,7 +84,7 @@ Customize and repackage as a TDE package.
      include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
  endif(ENABLE_CODECOVERAGE)
  
-@@ -467,10 +467,10 @@
+@@ -471,10 +471,10 @@
  # Build command to run uncrustify on its own sources
  #
  add_custom_target(format-sources)
@@ -97,7 +97,7 @@ Customize and repackage as a TDE package.
        -c forUncrustifySources.cfg
        -lCPP --no-backup ${source}
      COMMENT "Formatting ${source}"
-@@ -482,7 +482,7 @@
+@@ -486,7 +486,7 @@
  #
  # Package
  #
@@ -106,10 +106,10 @@ Customize and repackage as a TDE package.
  set(CPACK_PACKAGE_VERSION "${UNCRUSTIFY_VERSION}")
  set(CPACK_PACKAGE_VENDOR "Ben Gardner")
  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code beautifier")
-@@ -500,8 +500,8 @@
+@@ -504,8 +504,8 @@
  # Install
  #
- if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ if(MSVC)
 -  install(TARGETS uncrustify DESTINATION ".")
 -  install(FILES ${uncrustify_docs}
 +  install(TARGETS uncrustify-trinity DESTINATION ".")
@@ -117,7 +117,7 @@ Customize and repackage as a TDE package.
      DESTINATION "."
    )
    install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
-@@ -513,17 +513,17 @@
+@@ -517,17 +517,17 @@
    )
  else()
    include(GNUInstallDirs)
@@ -167,19 +167,19 @@ Customize and repackage as a TDE package.
        -d --git ${GIT_EXECUTABLE}
        --result-dir ${CMAKE_CURRENT_BINARY_DIR}
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -71,7 +71,7 @@
-   NAME cli_options
+@@ -72,7 +72,7 @@
    COMMAND ${PYTHON_EXECUTABLE}
      test_cli_options.py
+     --config $<CONFIG>
 -    --build ${uncrustify_BINARY_DIR}
 +    --build ${uncrustify-trinity_BINARY_DIR}
      --diff
    ${_configs}
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli
-@@ -80,10 +80,10 @@
- add_custom_target(update-cli-options
+@@ -82,10 +82,10 @@
    COMMAND ${PYTHON_EXECUTABLE}
      test_cli_options.py
+     --config $<CONFIG>
 -    --build ${uncrustify_BINARY_DIR}
 +    --build ${uncrustify-trinity_BINARY_DIR}
      --apply
@@ -201,7 +201,7 @@ Customize and repackage as a TDE package.
  If reading from stdin, you should specify the language using -l
 --- a/tests/cli/test_cli_options.py
 +++ b/tests/cli/test_cli_options.py
-@@ -482,16 +482,16 @@
+@@ -486,16 +486,16 @@
      bin_found = False
      uncr_bin = ''
      bd_dir = parsed_args.build
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/003_allow_older_distributions.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/003_allow_older_distributions.diff
index 3781601a..0dc9c476 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/003_allow_older_distributions.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/003_allow_older_distributions.diff
@@ -8,7 +8,7 @@ Index: b/CMakeLists.txt
  
  project(uncrustify-trinity)
  
-@@ -51,8 +51,12 @@
+@@ -52,8 +52,12 @@
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
  endif()
  
@@ -23,7 +23,7 @@ Index: b/CMakeLists.txt
  
  if(ENABLE_SANITIZER)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fno-omit-frame-pointer -fsanitize=${ENABLE_SANITIZER}")
-@@ -139,8 +143,13 @@
+@@ -140,8 +144,13 @@
  else()
    # Add target to generate version header;
    # do this every build to ensure git SHA is up to date
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/004_fixed_usage.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/004_fixed_usage.diff
index 1d6fd0bf..d9f7cd5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/004_fixed_usage.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/004_fixed_usage.diff
@@ -1,8 +1,8 @@
 Fixed usage message to match uncrustify-trinity.
 --- a/src/uncrustify.cpp
 +++ b/src/uncrustify.cpp
-@@ -309,14 +309,14 @@
-            " --decode           : Decode remaining args (chunk flags) and exit.\n"
+@@ -295,14 +295,14 @@
+            "                         Cannot be used with the -o option'\n"
             "\n"
             "Usage Examples\n"
 -           "cat foo.d | uncrustify -q -c my.cfg -l d\n"
@@ -27,7 +27,7 @@ Fixed usage message to match uncrustify-trinity.
 --- a/tests/cli/output/help.txt
 +++ b/tests/cli/output/help.txt
 @@ -60,14 +60,14 @@
-  --decode           : Decode remaining args (chunk flags) and exit.
+                          Cannot be used with the -o option'
  
  Usage Examples
 -cat foo.d | uncrustify -q -c my.cfg -l d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series
index eb36bb0b..383a9d11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series
@@ -2,6 +2,3 @@
 002_trinity_customization.diff
 003_allow_older_distributions.diff
 004_fixed_usage.diff
-005_upstream_45681e88.diff
-006_upstream_64d93e3fb.diff
-007_issue_3040.diff
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules
new file mode 100755
index 00000000..19d77a93
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_TESTING="ON" \
+ -DUNCRUSTIFY_SEPARATE_TESTS="ON"
+
+DEB_MAKE_CHECK_TARGET = test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/format b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/format
index 163aaf8d..163aaf8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/format
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/format
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/options b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/options
index d71748bb..d71748bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/options
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/source/options
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Track.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Track.jpg
new file mode 100644
index 00000000..b18b0477
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Track.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Tracking.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Tracking.txt
new file mode 100644
index 00000000..a1fb7850
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/Tracking.txt
@@ -0,0 +1,52 @@
+2020-11-09
+
+Tracking is used to put some marks within a copy of the source and
+in the log file. uncrustify generate a HTML file with the marks.
+
+Using a browser, one can see where, which options are working.
+
+The command option is:
+
+uncrustify --tracking Track.html -c config-FILE -f source-FILE -L A 2>A.txt
+
+Tracking puts a red "M" in the source to show where the options are working.
+A tracking number is used and writen in the Track.html file and the output file A.txt
+to make possible to link the changes together.
+
+An example:
+
+tracking.cpp
+{
+   a =     b +              111-55;
+}
+
+The config file:
+
+indent_with_tabs = 0
+sp_arith  = force
+sp_assign = force
+
+The tracking file is:
+
+<html>
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+   <title>Uncrustify: where do the Spaces options work</title>
+</head>
+<body lang="en-US">
+<p>
+</p>
+<pre>
+{
+        a<a title="1,8,sp_assign"><font color="red">M</font></a>=<a title="2,9,16,sp_assign"><font color="red">M</font><
+/a>b<a title="3,10,17,22,sp_arith"><font color="red">M</font></a>+<a title="4,11,18,23,27,sp_arith"><font color="red">M<
+/font></a>111<a title="5,12,19,24,28,31,sp_arith"><font color="red">M</font></a>-<a title="6,13,20,25,29,32,34,sp_arith"
+><font color="red">M</font></a>55<a title="7,14,21,26,30,33,35,36,sp_before_semi"><font color="red">M</font></a>;
+}
+</pre>
+</body>
+</html>
+
+Use it with a browser and you can see the red "M"s.
+Let put the cursor on the "M"s, and you see the tracking number and the option used.
+(look at the picture track.jpg)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/align-thresholds.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/align-thresholds.txt
index 4c41f7db..4c41f7db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/align-thresholds.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/align-thresholds.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/control_the_spaces.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/control_the_spaces.txt
new file mode 100644
index 00000000..8ea2ac52
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/control_the_spaces.txt
@@ -0,0 +1,22 @@
+2021-01-23
+
+Guy Maurel
+
+The do_space function within the file space.cpp controls the space between every two tokens.
+
+There are three categories of actions.
+The first one is the most important.
+Options control what is to do with the interval between the two token:
+ *   "Ignore" means do not change it.
+ *   "Add" in the context of spaces means make sure there is at least 1.
+ *   "Add" elsewhere means make sure one is present.
+ *   "Remove" mean remove the space/brace/newline/etc.
+ *   "Force" in the context of spaces means ensure that there is exactly 1.
+ *   "Force" in other contexts means the same as "add".
+For example the option "sp_before_assign":
+Add or remove space before assignment operator '=', '+=', etc.
+in such a statement:
+  a =5;
+
+The second categorie is used for all positions where no option is coded.
+The third categorie is a debug for the developer, who still have something to do.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/goals.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/goals.txt
index 610ec121..610ec121 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/goals.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/goals.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/how_to_format_cpp_lambda_functions.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/how_to_format_cpp_lambda_functions.rst
index e15776d4..e15776d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/how_to_format_cpp_lambda_functions.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/how_to_format_cpp_lambda_functions.rst
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/align_typedef.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/align_typedef.html
index 6d94eadf..6d94eadf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/align_typedef.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/align_typedef.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/ben.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/ben.cfg.txt
index 97229cb0..97229cb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/ben.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/ben.cfg.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/config.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/config.txt
index 955e1fa2..e87d42ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/config.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/config.txt
@@ -1,4 +1,4 @@
-# Uncrustify_d-0.71.0-250-9c62bb00
+# Uncrustify-0.73.0
 
 #
 # General options
@@ -37,18 +37,16 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
 disable_processing_nl_cont      = false    # true/false
 
 # Specify the marker used in comments to disable processing of part of the
 # file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *INDENT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *INDENT-ON*"     # string
@@ -56,8 +54,14 @@ enable_processing_cmt           = " *INDENT-ON*"     # string
 # Enable parsing of digraphs.
 enable_digraphs                 = false    # true/false
 
+# Option to allow both disable_processing_cmt and enable_processing_cmt
+# strings, if specified, to be interpreted as ECMAScript regular expressions.
+# If true, a regex search will be performed within comments according to the
+# specified patterns in order to disable/enable processing.
+processing_cmt_as_regex         = false    # true/false
+
 # Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
 
 # If the file contains bytes with values between 128 and 255, but is not
 # UTF-8, then output as UTF-8.
@@ -66,179 +70,175 @@ utf8_byte                       = false    # true/false
 # Force the output encoding to UTF-8.
 utf8_force                      = false    # true/false
 
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'while' and '('.
-sp_while_paren_open             = ignore   # ignore/add/remove/force
-
 #
 # Spacing options
 #
 
 # Add or remove space around non-assignment symbolic operators ('+', '/', '%',
 # '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
+sp_arith                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around arithmetic operators '+' and '-'.
 #
 # Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
+sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
+sp_assign                       = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda when
 # an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda with
 # no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> int x <here> ){ ... }'.
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the argument list of a C++11 lambda, as in
 # '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a lambda body and its call operator of an
 # immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=' in a prototype.
 #
 # If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
+sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
+sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
+sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
+sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
+sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around preprocessor '##' concatenation operator.
 #
 # Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
+sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
+sp_bool                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
+sp_compare                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
+sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
+sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
+sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to balance spaces inside nested parentheses.
 sp_balance_nested_parens        = false    # true/false
 
 # Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
+sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
+# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
+sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
+sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_block_caret        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_qualifier     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a pointer star '*', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
+sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after reference sign '&', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
+sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a reference sign '&', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
+sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -251,50 +251,49 @@ sp_before_byref_func            = ignore   # ignore/add/remove/force
 # following word.
 #
 # Default: force
-sp_after_type                   = force    # ignore/add/remove/force
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
+# Add or remove space between 'decltype(...)' and word,
+# brace or function call.
+sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
 
 # (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_template_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_template_angle               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
+sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
+sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
+sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
+sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
+sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_angle_word                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '>' in '>>' (template stuff).
 #
 # Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
 
 # (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
 # that sp_angle_shift cannot remove the space without this option.
@@ -302,632 +301,648 @@ sp_permit_cpp11_shift           = false    # true/false
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
+sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '(' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ')' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
+sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
+sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
+sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
+sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';'.
 #
 # Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
+sp_after_semi                   = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
 # Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
 
 # 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_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
+sp_before_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for a variable definition.
 #
 # Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
+sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
+sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
+sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # (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_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ','.
 #
 # Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between an open parenthesis and comma,
 # i.e. '(,' vs. '( ,'.
 #
 # Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
+sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
+sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
+sp_type_question                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
+sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
+sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
+sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
+sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before case ':'.
 #
 # Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
+sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_operator_sym           = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_cast                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
+sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
+sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
+sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_func                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
+sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_tparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
+sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of a function call in object
 # initialization.
 #
 # Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_user_paren         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
 
 # 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_paren_paren   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a constructor/destructor and the open
 # parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
+sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
+sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
+sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
+sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
+sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space before Objective-C protocol list
 # as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'super' and '(' in 'super (something)'.
 #
 # Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'this' and '(' in 'this (something)'.
 #
 # Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
+sp_macro                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
+sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
+sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
+sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
+sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
+sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
+sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
+sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for C++ uniform
 # initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # 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                = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
+sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
+sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '!' (not) unary operator.
 #
 # Default: remove
-sp_not                          = remove   # ignore/add/remove/force
+sp_not                          = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
 
 # 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                         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
 # Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+sp_member                       = remove   # ignore/add/remove/force/not_defined
 
 # 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                        = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
 #
 # Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
 
 # 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                       = remove   # ignore/add/remove/force/not_defined
 
 # 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               = add      # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
+sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var : <here> expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var <here> : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
+# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 
-# 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
+# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
+# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+# A region marker is defined as a comment which is not preceded by other text
+# (i.e. the comment is the first non-whitespace on the line), and which starts
+# with either 'BEGIN' or 'END'.
+#
+# Overrides sp_cmt_cpp_start.
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+
+# If true, space 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 '//~'.
+# If true, space 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
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
+sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
+sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
+sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # If true, vbrace tokens are dropped to the previous token and skipped.
 sp_skip_vbrace_tokens           = false    # true/false
 
 # Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
+sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
+sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
@@ -1031,6 +1046,12 @@ indent_extern                   = false    # true/false
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Additional indent before the leading base class colon.
+# Negative values decrease indent down to the first column.
+# Requires a newline break before colon (see pos_class_colon
+# and nl_class_colon)
+indent_before_class_colon       = 0        # number
+
 # Whether to indent the stuff after a leading base class colon.
 indent_class_colon              = false    # true/false
 
@@ -1142,8 +1163,14 @@ indent_sparen_extra             = 0        # number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# It might wise to choose the same value for the option indent_case_brace.
 indent_switch_case              = 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.
+# It might wise to choose the same value for the option indent_switch_case.
+indent_case_brace               = 0        # number
+
 # indent 'break' with 'case' from 'switch'.
 indent_switch_break_with_case   = false    # true/false
 
@@ -1156,10 +1183,6 @@ indent_switch_pp                = true     # true/false
 # 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.
-indent_case_brace               = 0        # number
-
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
@@ -1210,6 +1233,10 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
+# Whether to indent a comma when inside a brace.
+# If true, aligns under the open brace.
+indent_comma_brace              = false    # true/false
+
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
 indent_comma_paren              = false    # true/false
@@ -1316,10 +1343,10 @@ indent_token_after_brace        = true     # true/false
 indent_cpp_lambda_body          = false    # true/false
 
 # How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
+# true: add both the indent from return & the compound literal open brace
+#       (i.e. 2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only
+#        add the indent for the return.
 #
 # Default: true
 indent_compound_literal_return  = true     # true/false
@@ -1336,7 +1363,7 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
-# Whether to indent the statments inside ternary operator.
+# Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
 
 # If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
@@ -1392,6 +1419,9 @@ nl_if_leave_one_liners          = false    # true/false
 # Don't split one-line while statements, as in 'while(...) b++;'.
 nl_while_leave_one_liners       = false    # true/false
 
+# Don't split one-line do statements, as in 'do { b++; } while(...);'.
+nl_do_leave_one_liners          = false    # true/false
+
 # Don't split one-line for statements, as in 'for(...) b++;'.
 nl_for_leave_one_liners         = false    # true/false
 
@@ -1399,166 +1429,166 @@ nl_for_leave_one_liners         = false    # true/false
 nl_oc_msg_leave_one_liner       = false    # true/false
 
 # (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
+nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline after '= ['. Will also affect the newline before
 # the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
+nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
+nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
+nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
+nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
+nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
+nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
+nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
+nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
+nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
+nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
+nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
+nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
+nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
+nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
+nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
+nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline between ')' and '{' if the ')' is on a different line than the
 # if/for/etc.
@@ -1569,11 +1599,11 @@ nl_multi_line_cond              = false    # true/false
 
 # Add a newline after '(' if an if/for/while/switch condition spans multiple
 # lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline before ')' if an if/for/while/switch condition spans multiple
 # lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
 
 # Force a newline in a define after the macro name for multi-line defines.
 nl_multi_line_define            = false    # true/false
@@ -1588,141 +1618,141 @@ nl_after_case                   = false    # true/false
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
+nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
+nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
+nl_template_class               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class declaration.
 #
 # Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
+nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class declaration.
 #
 # Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class definition.
 #
 # Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
+nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class definition.
 #
 # Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
+nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
+nl_template_func                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # declaration.
 #
 # Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
+nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # declaration.
 #
 # Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # definition.
 #
 # Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
+nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # definition.
 #
 # Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
+nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
+nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'template<...>' and 'using' of a templated
 # type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
+nl_template_using               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
+nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before or after (depending on pos_class_comma,
 # may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
+nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between return type and function name in a function
 # definition.
 # might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
+nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_name_class         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_class_scope             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_scope_name              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
 
 # 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                   = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
+nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
 
 # 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               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # 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              = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
+nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
+nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
+nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1733,13 +1763,13 @@ nl_func_decl_start_multi_line   = false    # true/false
 nl_func_def_start_multi_line    = false    # true/false
 
 # Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
+nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
+nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
+nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1750,16 +1780,16 @@ nl_func_decl_args_multi_line    = false    # true/false
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
+nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1770,20 +1800,20 @@ nl_func_decl_end_multi_line     = false    # true/false
 nl_func_def_end_multi_line      = false    # true/false
 
 # Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call,
 # has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
+nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
+nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -1797,7 +1827,7 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
-# Whether to respect nl_func_call_XXX option incase of closure args.
+# Whether to respect nl_func_call_XXX option in case of closure args.
 nl_func_call_args_multi_line_ignore_closures = false    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
@@ -1814,36 +1844,36 @@ nl_template_end                 = false    # true/false
 nl_oc_msg_args                  = false    # true/false
 
 # Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
+nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between function signature and '{',
 # if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
 # (Java) Add or remove newline between the ')' and '{{' of the double brace
 # initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # 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          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_open     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '{'. This also adds a newline before the
 # matching '}'.
@@ -1872,7 +1902,7 @@ 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.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to alter newlines in '#define' macros.
 nl_define_macro                 = false    # true/false
@@ -1890,41 +1920,41 @@ nl_squeeze_ifdef                = false    # true/false
 nl_squeeze_ifdef_top_level      = false    # true/false
 
 # Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_if                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to put a blank line before 'return' statements, unless after an open
 # brace.
@@ -1935,10 +1965,10 @@ nl_before_return                = false    # true/false
 nl_after_return                 = false    # true/false
 
 # Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
+nl_before_member                = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
+nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to double-space commented-entries in 'struct'/'union'/'enum'.
 nl_ds_struct_enum_cmt           = false    # true/false
@@ -1949,11 +1979,11 @@ nl_ds_struct_enum_close_brace   = false    # true/false
 
 # 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_class_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -1977,9 +2007,8 @@ nl_create_while_one_liner       = false    # true/false
 # a single line.
 nl_create_func_def_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.
+# Whether to split one-line simple unbraced if statements into three lines by
+# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 nl_create_list_one_liner        = false    # true/false
 
 # Whether to split one-line simple unbraced if statements into two lines by
@@ -2009,13 +2038,16 @@ nl_max                          = 0        # unsigned number
 nl_max_blank_in_func            = 0        # unsigned number
 
 # The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
+# This option overrides eat_blanks_after_open_brace and
+# eat_blanks_before_close_brace, but is ignored when
+# nl_collapse_empty_body=true
 nl_inside_empty_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.
+# The number of newlines before a multi-line function definition. Where
+# applicable, this option is overridden with eat_blanks_after_open_brace=true
 nl_before_func_body_def         = 0        # unsigned number
 
 # The number of newlines before a class constructor/destructor prototype.
@@ -2183,7 +2215,7 @@ nl_around_cs_property           = 0        # unsigned number
 nl_between_get_set              = 0        # unsigned number
 
 # (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
+nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove blank lines after '{'.
 eat_blanks_after_open_brace     = false    # true/false
@@ -2200,10 +2232,10 @@ nl_remove_extra_newlines        = 0        # unsigned number
 
 # (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
+nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
+nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
 
 # The number of newlines before a whole-file #ifdef.
 #
@@ -2617,9 +2649,44 @@ cmt_width                       = 0        # unsigned number
 #
 # 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
 # 1: No touching at all
-# 2: Full reflow
+# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
 cmt_reflow_mode                 = 0        # unsigned number
 
+# Path to a file that contains regular expressions describing patterns for
+# which the end of one line and the beginning of the next will be folded into
+# the same sentence or paragraph during full comment reflow. The regular
+# expressions are described using ECMAScript syntax. The syntax for this
+# specification is as follows, where "..." indicates the custom regular
+# expression and "n" indicates the nth end_of_prev_line_regex and
+# beg_of_next_line_regex regular expression pair:
+#
+# end_of_prev_line_regex[1] = "...$"
+# beg_of_next_line_regex[1] = "^..."
+# end_of_prev_line_regex[2] = "...$"
+# beg_of_next_line_regex[2] = "^..."
+#             .
+#             .
+#             .
+# end_of_prev_line_regex[n] = "...$"
+# beg_of_next_line_regex[n] = "^..."
+#
+# Note that use of this option overrides the default reflow fold regular
+# expressions, which are internally defined as follows:
+#
+# end_of_prev_line_regex[1] = "[\w,\]\)]$"
+# beg_of_next_line_regex[1] = "^[\w,\[\(]"
+# end_of_prev_line_regex[2] = "\.$"
+# beg_of_next_line_regex[2] = "^[A-Z]"
+cmt_reflow_fold_regex_file      = ""         # string
+
+# Whether to indent wrapped lines to the start of the encompassing paragraph
+# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+# specified by cmt_sp_after_star_cont.
+#
+# Note that cmt_align_doxygen_javadoc_tags overrides this option for
+# paragraphs associated with javadoc tags
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+
 # 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
@@ -2630,6 +2697,22 @@ cmt_convert_tab_to_spaces       = false    # true/false
 # Default: true
 cmt_indent_multi                = true     # true/false
 
+# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+# and corresponding fields such that groups of consecutive block tags,
+# parameter names, and descriptions align with one another. Overrides that
+# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+# in order to achieve the desired alignment for line-wrapping.
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+
+# The number of spaces to insert after the star and before doxygen
+# javadoc-style tags (@param, @return, etc). Requires enabling
+# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+# cmt_sp_after_star_cont.
+#
+# Default: 1
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+
 # Whether to group c-comments that look like they are in a block.
 cmt_c_group                     = false    # true/false
 
@@ -2736,17 +2819,17 @@ cmt_insert_before_ctor_dtor     = false    # true/false
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
+mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
+mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
+mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_if               = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -2762,10 +2845,10 @@ mod_full_brace_if_chain         = false    # true/false
 mod_full_brace_if_chain_only    = false    # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
+mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
+mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl               = 0        # unsigned number
@@ -2787,7 +2870,7 @@ mod_full_brace_nl               = 0        # unsigned number
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
 # Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
@@ -2862,14 +2945,14 @@ mod_move_case_break             = false    # true/false
 
 # 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_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
@@ -2904,7 +2987,7 @@ mod_sort_oc_property_nullability_weight = 0        # number
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Whether to indent #if/#else/#endif at the brace level. If false, these are
 # indented from column 1.
@@ -2919,7 +3002,7 @@ pp_indent_at_level              = false    # true/false
 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
+pp_space                        = ignore   # ignore/add/remove/force/not_defined
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 0        # unsigned number
@@ -3042,9 +3125,8 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
+# If true: the form feed character is removed from the list of whitespace
+# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
 use_form_feed_no_more_as_whitespace_character = false    # true/false
 
 #
@@ -3072,6 +3154,10 @@ debug_line_number_to_protocol   = 0        # number
 # only for linux
 debug_timeout                   = 0        # number
 
+# Set the number of characters to be printed if the text is too long,
+# 0: do not truncate.
+debug_truncate                  = 0        # unsigned number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/configuration.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/configuration.txt
index f61b1176..f61b1176 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/configuration.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/configuration.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/default.cfg
index 955e1fa2..e87d42ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/default.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/default.cfg
@@ -1,4 +1,4 @@
-# Uncrustify_d-0.71.0-250-9c62bb00
+# Uncrustify-0.73.0
 
 #
 # General options
@@ -37,18 +37,16 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
 disable_processing_nl_cont      = false    # true/false
 
 # Specify the marker used in comments to disable processing of part of the
 # file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *INDENT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *INDENT-ON*"     # string
@@ -56,8 +54,14 @@ enable_processing_cmt           = " *INDENT-ON*"     # string
 # Enable parsing of digraphs.
 enable_digraphs                 = false    # true/false
 
+# Option to allow both disable_processing_cmt and enable_processing_cmt
+# strings, if specified, to be interpreted as ECMAScript regular expressions.
+# If true, a regex search will be performed within comments according to the
+# specified patterns in order to disable/enable processing.
+processing_cmt_as_regex         = false    # true/false
+
 # Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
 
 # If the file contains bytes with values between 128 and 255, but is not
 # UTF-8, then output as UTF-8.
@@ -66,179 +70,175 @@ utf8_byte                       = false    # true/false
 # Force the output encoding to UTF-8.
 utf8_force                      = false    # true/false
 
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'while' and '('.
-sp_while_paren_open             = ignore   # ignore/add/remove/force
-
 #
 # Spacing options
 #
 
 # Add or remove space around non-assignment symbolic operators ('+', '/', '%',
 # '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
+sp_arith                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around arithmetic operators '+' and '-'.
 #
 # Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
+sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
+sp_assign                       = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda when
 # an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda with
 # no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> int x <here> ){ ... }'.
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the argument list of a C++11 lambda, as in
 # '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a lambda body and its call operator of an
 # immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=' in a prototype.
 #
 # If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
+sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
+sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
+sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
+sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
+sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around preprocessor '##' concatenation operator.
 #
 # Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
+sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
+sp_bool                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
+sp_compare                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
+sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
+sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
+sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to balance spaces inside nested parentheses.
 sp_balance_nested_parens        = false    # true/false
 
 # Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
+sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
+# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
+sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
+sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_block_caret        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_qualifier     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a pointer star '*', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
+sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after reference sign '&', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
+sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a reference sign '&', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
+sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -251,50 +251,49 @@ sp_before_byref_func            = ignore   # ignore/add/remove/force
 # following word.
 #
 # Default: force
-sp_after_type                   = force    # ignore/add/remove/force
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
+# Add or remove space between 'decltype(...)' and word,
+# brace or function call.
+sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
 
 # (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_template_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_template_angle               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
+sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
+sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
+sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
+sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
+sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_angle_word                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '>' in '>>' (template stuff).
 #
 # Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
 
 # (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
 # that sp_angle_shift cannot remove the space without this option.
@@ -302,632 +301,648 @@ sp_permit_cpp11_shift           = false    # true/false
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
+sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '(' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ')' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
+sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
+sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
+sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
+sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';'.
 #
 # Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
+sp_after_semi                   = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
 # Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
 
 # 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_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
+sp_before_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for a variable definition.
 #
 # Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
+sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
+sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
+sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # (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_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ','.
 #
 # Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between an open parenthesis and comma,
 # i.e. '(,' vs. '( ,'.
 #
 # Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
+sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
+sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
+sp_type_question                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
+sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
+sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
+sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
+sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before case ':'.
 #
 # Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
+sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_operator_sym           = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_cast                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
+sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
+sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
+sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_func                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
+sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_tparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
+sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of a function call in object
 # initialization.
 #
 # Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_user_paren         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
 
 # 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_paren_paren   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a constructor/destructor and the open
 # parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
+sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
+sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
+sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
+sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
+sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space before Objective-C protocol list
 # as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'super' and '(' in 'super (something)'.
 #
 # Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'this' and '(' in 'this (something)'.
 #
 # Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
+sp_macro                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
+sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
+sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
+sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
+sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
+sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
+sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
+sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for C++ uniform
 # initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # 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                = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
+sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
+sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '!' (not) unary operator.
 #
 # Default: remove
-sp_not                          = remove   # ignore/add/remove/force
+sp_not                          = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
 
 # 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                         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
 # Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+sp_member                       = remove   # ignore/add/remove/force/not_defined
 
 # 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                        = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
 #
 # Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
 
 # 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                       = remove   # ignore/add/remove/force/not_defined
 
 # 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               = add      # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
+sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var : <here> expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var <here> : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
+# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 
-# 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
+# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
+# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+# A region marker is defined as a comment which is not preceded by other text
+# (i.e. the comment is the first non-whitespace on the line), and which starts
+# with either 'BEGIN' or 'END'.
+#
+# Overrides sp_cmt_cpp_start.
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+
+# If true, space 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 '//~'.
+# If true, space 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
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
+sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
+sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
+sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # If true, vbrace tokens are dropped to the previous token and skipped.
 sp_skip_vbrace_tokens           = false    # true/false
 
 # Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
+sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
+sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
@@ -1031,6 +1046,12 @@ indent_extern                   = false    # true/false
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Additional indent before the leading base class colon.
+# Negative values decrease indent down to the first column.
+# Requires a newline break before colon (see pos_class_colon
+# and nl_class_colon)
+indent_before_class_colon       = 0        # number
+
 # Whether to indent the stuff after a leading base class colon.
 indent_class_colon              = false    # true/false
 
@@ -1142,8 +1163,14 @@ indent_sparen_extra             = 0        # number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# It might wise to choose the same value for the option indent_case_brace.
 indent_switch_case              = 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.
+# It might wise to choose the same value for the option indent_switch_case.
+indent_case_brace               = 0        # number
+
 # indent 'break' with 'case' from 'switch'.
 indent_switch_break_with_case   = false    # true/false
 
@@ -1156,10 +1183,6 @@ indent_switch_pp                = true     # true/false
 # 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.
-indent_case_brace               = 0        # number
-
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
@@ -1210,6 +1233,10 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
+# Whether to indent a comma when inside a brace.
+# If true, aligns under the open brace.
+indent_comma_brace              = false    # true/false
+
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
 indent_comma_paren              = false    # true/false
@@ -1316,10 +1343,10 @@ indent_token_after_brace        = true     # true/false
 indent_cpp_lambda_body          = false    # true/false
 
 # How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
+# true: add both the indent from return & the compound literal open brace
+#       (i.e. 2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only
+#        add the indent for the return.
 #
 # Default: true
 indent_compound_literal_return  = true     # true/false
@@ -1336,7 +1363,7 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
-# Whether to indent the statments inside ternary operator.
+# Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
 
 # If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
@@ -1392,6 +1419,9 @@ nl_if_leave_one_liners          = false    # true/false
 # Don't split one-line while statements, as in 'while(...) b++;'.
 nl_while_leave_one_liners       = false    # true/false
 
+# Don't split one-line do statements, as in 'do { b++; } while(...);'.
+nl_do_leave_one_liners          = false    # true/false
+
 # Don't split one-line for statements, as in 'for(...) b++;'.
 nl_for_leave_one_liners         = false    # true/false
 
@@ -1399,166 +1429,166 @@ nl_for_leave_one_liners         = false    # true/false
 nl_oc_msg_leave_one_liner       = false    # true/false
 
 # (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
+nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline after '= ['. Will also affect the newline before
 # the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
+nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
+nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
+nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
+nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
+nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
+nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
+nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
+nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
+nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
+nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
+nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
+nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
+nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
+nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
+nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
+nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline between ')' and '{' if the ')' is on a different line than the
 # if/for/etc.
@@ -1569,11 +1599,11 @@ nl_multi_line_cond              = false    # true/false
 
 # Add a newline after '(' if an if/for/while/switch condition spans multiple
 # lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline before ')' if an if/for/while/switch condition spans multiple
 # lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
 
 # Force a newline in a define after the macro name for multi-line defines.
 nl_multi_line_define            = false    # true/false
@@ -1588,141 +1618,141 @@ nl_after_case                   = false    # true/false
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
+nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
+nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
+nl_template_class               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class declaration.
 #
 # Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
+nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class declaration.
 #
 # Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class definition.
 #
 # Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
+nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class definition.
 #
 # Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
+nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
+nl_template_func                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # declaration.
 #
 # Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
+nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # declaration.
 #
 # Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # definition.
 #
 # Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
+nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # definition.
 #
 # Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
+nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
+nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'template<...>' and 'using' of a templated
 # type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
+nl_template_using               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
+nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before or after (depending on pos_class_comma,
 # may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
+nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between return type and function name in a function
 # definition.
 # might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
+nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_name_class         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_class_scope             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_scope_name              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
 
 # 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                   = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
+nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
 
 # 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               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # 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              = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
+nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
+nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
+nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1733,13 +1763,13 @@ nl_func_decl_start_multi_line   = false    # true/false
 nl_func_def_start_multi_line    = false    # true/false
 
 # Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
+nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
+nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
+nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1750,16 +1780,16 @@ nl_func_decl_args_multi_line    = false    # true/false
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
+nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1770,20 +1800,20 @@ nl_func_decl_end_multi_line     = false    # true/false
 nl_func_def_end_multi_line      = false    # true/false
 
 # Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call,
 # has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
+nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
+nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -1797,7 +1827,7 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
-# Whether to respect nl_func_call_XXX option incase of closure args.
+# Whether to respect nl_func_call_XXX option in case of closure args.
 nl_func_call_args_multi_line_ignore_closures = false    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
@@ -1814,36 +1844,36 @@ nl_template_end                 = false    # true/false
 nl_oc_msg_args                  = false    # true/false
 
 # Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
+nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between function signature and '{',
 # if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
 # (Java) Add or remove newline between the ')' and '{{' of the double brace
 # initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # 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          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_open     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '{'. This also adds a newline before the
 # matching '}'.
@@ -1872,7 +1902,7 @@ 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.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to alter newlines in '#define' macros.
 nl_define_macro                 = false    # true/false
@@ -1890,41 +1920,41 @@ nl_squeeze_ifdef                = false    # true/false
 nl_squeeze_ifdef_top_level      = false    # true/false
 
 # Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_if                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to put a blank line before 'return' statements, unless after an open
 # brace.
@@ -1935,10 +1965,10 @@ nl_before_return                = false    # true/false
 nl_after_return                 = false    # true/false
 
 # Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
+nl_before_member                = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
+nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to double-space commented-entries in 'struct'/'union'/'enum'.
 nl_ds_struct_enum_cmt           = false    # true/false
@@ -1949,11 +1979,11 @@ nl_ds_struct_enum_close_brace   = false    # true/false
 
 # 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_class_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -1977,9 +2007,8 @@ nl_create_while_one_liner       = false    # true/false
 # a single line.
 nl_create_func_def_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.
+# Whether to split one-line simple unbraced if statements into three lines by
+# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 nl_create_list_one_liner        = false    # true/false
 
 # Whether to split one-line simple unbraced if statements into two lines by
@@ -2009,13 +2038,16 @@ nl_max                          = 0        # unsigned number
 nl_max_blank_in_func            = 0        # unsigned number
 
 # The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
+# This option overrides eat_blanks_after_open_brace and
+# eat_blanks_before_close_brace, but is ignored when
+# nl_collapse_empty_body=true
 nl_inside_empty_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.
+# The number of newlines before a multi-line function definition. Where
+# applicable, this option is overridden with eat_blanks_after_open_brace=true
 nl_before_func_body_def         = 0        # unsigned number
 
 # The number of newlines before a class constructor/destructor prototype.
@@ -2183,7 +2215,7 @@ nl_around_cs_property           = 0        # unsigned number
 nl_between_get_set              = 0        # unsigned number
 
 # (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
+nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove blank lines after '{'.
 eat_blanks_after_open_brace     = false    # true/false
@@ -2200,10 +2232,10 @@ nl_remove_extra_newlines        = 0        # unsigned number
 
 # (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
+nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
+nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
 
 # The number of newlines before a whole-file #ifdef.
 #
@@ -2617,9 +2649,44 @@ cmt_width                       = 0        # unsigned number
 #
 # 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
 # 1: No touching at all
-# 2: Full reflow
+# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
 cmt_reflow_mode                 = 0        # unsigned number
 
+# Path to a file that contains regular expressions describing patterns for
+# which the end of one line and the beginning of the next will be folded into
+# the same sentence or paragraph during full comment reflow. The regular
+# expressions are described using ECMAScript syntax. The syntax for this
+# specification is as follows, where "..." indicates the custom regular
+# expression and "n" indicates the nth end_of_prev_line_regex and
+# beg_of_next_line_regex regular expression pair:
+#
+# end_of_prev_line_regex[1] = "...$"
+# beg_of_next_line_regex[1] = "^..."
+# end_of_prev_line_regex[2] = "...$"
+# beg_of_next_line_regex[2] = "^..."
+#             .
+#             .
+#             .
+# end_of_prev_line_regex[n] = "...$"
+# beg_of_next_line_regex[n] = "^..."
+#
+# Note that use of this option overrides the default reflow fold regular
+# expressions, which are internally defined as follows:
+#
+# end_of_prev_line_regex[1] = "[\w,\]\)]$"
+# beg_of_next_line_regex[1] = "^[\w,\[\(]"
+# end_of_prev_line_regex[2] = "\.$"
+# beg_of_next_line_regex[2] = "^[A-Z]"
+cmt_reflow_fold_regex_file      = ""         # string
+
+# Whether to indent wrapped lines to the start of the encompassing paragraph
+# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+# specified by cmt_sp_after_star_cont.
+#
+# Note that cmt_align_doxygen_javadoc_tags overrides this option for
+# paragraphs associated with javadoc tags
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+
 # 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
@@ -2630,6 +2697,22 @@ cmt_convert_tab_to_spaces       = false    # true/false
 # Default: true
 cmt_indent_multi                = true     # true/false
 
+# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+# and corresponding fields such that groups of consecutive block tags,
+# parameter names, and descriptions align with one another. Overrides that
+# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+# in order to achieve the desired alignment for line-wrapping.
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+
+# The number of spaces to insert after the star and before doxygen
+# javadoc-style tags (@param, @return, etc). Requires enabling
+# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+# cmt_sp_after_star_cont.
+#
+# Default: 1
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+
 # Whether to group c-comments that look like they are in a block.
 cmt_c_group                     = false    # true/false
 
@@ -2736,17 +2819,17 @@ cmt_insert_before_ctor_dtor     = false    # true/false
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
+mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
+mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
+mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_if               = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -2762,10 +2845,10 @@ mod_full_brace_if_chain         = false    # true/false
 mod_full_brace_if_chain_only    = false    # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
+mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
+mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl               = 0        # unsigned number
@@ -2787,7 +2870,7 @@ mod_full_brace_nl               = 0        # unsigned number
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
 # Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
@@ -2862,14 +2945,14 @@ mod_move_case_break             = false    # true/false
 
 # 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_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
@@ -2904,7 +2987,7 @@ mod_sort_oc_property_nullability_weight = 0        # number
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Whether to indent #if/#else/#endif at the brace level. If false, these are
 # indented from column 1.
@@ -2919,7 +3002,7 @@ pp_indent_at_level              = false    # true/false
 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
+pp_space                        = ignore   # ignore/add/remove/force/not_defined
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 0        # unsigned number
@@ -3042,9 +3125,8 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
+# If true: the form feed character is removed from the list of whitespace
+# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
 use_form_feed_no_more_as_whitespace_character = false    # true/false
 
 #
@@ -3072,6 +3154,10 @@ debug_line_number_to_protocol   = 0        # number
 # only for linux
 debug_timeout                   = 0        # number
 
+# Set the number of characters to be printed if the text is too long,
+# 0: do not truncate.
+debug_truncate                  = 0        # unsigned number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/examples/c-1.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.in.c
index c1a53476..c1a53476 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/examples/c-1.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/examples/c-1.out.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.out.c
index ceb484c6..ceb484c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/examples/c-1.out.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/c-1.out.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/examples/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/examples/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/examples/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/images/linuxlinks.gif b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/images/linuxlinks.gif
index d3adec5c..d3adec5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/images/linuxlinks.gif
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/images/linuxlinks.gif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/index.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/index.html
index eed7ae92..f1e82751 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/index.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/index.html
@@ -54,7 +54,7 @@ Create a highly configurable, easily modifiable source code beautifier.</p>
    <li>Add or remove parens on return statements</li>
    <li>Add or remove braces on single-statement if/do/while/for statements</li>
    <li>Supports embedded SQL 'EXEC SQL' stuff</li>
-   <li>Highly configurable - 742 configurable options as of version 0.72.0</li>
+   <li>Highly configurable - 753 configurable options as of version 0.73.0</li>
 </ul>
 
 <p>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/linux.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/linux.cfg.txt
index baae9848..baae9848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/linux.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/linux.cfg.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options.html
index 554836c3..554836c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_ASM.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ASM.html
index 4de0e7bb..4de0e7bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_ASM.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ASM.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Align.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Align.html
index b034a132..b034a132 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Align.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Align.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_CLI_NET.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_CLI_NET.html
index 8838cdf0..8838cdf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_CLI_NET.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_CLI_NET.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_C_sharp.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_C_sharp.html
index 74767b9d..74767b9d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_C_sharp.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_C_sharp.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_D.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_D.html
index 308b5c58..308b5c58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_D.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_D.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Indenting.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Indenting.html
index 132628da..132628da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Indenting.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Indenting.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Java.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Java.html
index 80083042..80083042 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Java.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Java.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_ModifyCode.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ModifyCode.html
index e20e1098..e20e1098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_ModifyCode.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_ModifyCode.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Namespace.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Namespace.html
index 74589df0..74589df0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Namespace.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Namespace.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_NewLines.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_NewLines.html
index 9d9ad656..9d9ad656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_NewLines.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_NewLines.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Objectiv-C.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Objectiv-C.html
index 993a1b95..993a1b95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Objectiv-C.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Objectiv-C.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Positioning.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Positioning.html
index 4e8a36cc..4e8a36cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Positioning.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Positioning.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Preprocessor.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Preprocessor.html
index 1d99b69d..1d99b69d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Preprocessor.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Preprocessor.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Assign.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Assign.html
index 10c8b6b0..10c8b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Assign.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Assign.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Byref.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Byref.html
index 7ad47f72..7ad47f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Byref.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Byref.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Case.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Case.html
index e40bfc5b..e40bfc5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Case.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Case.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Cast.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Cast.html
index 9e0b6e2d..9e0b6e2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Cast.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Cast.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Class.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Class.html
index 1bd1c4a5..1bd1c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Class.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Class.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Comma.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Comma.html
index 3b3f0de1..3b3f0de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Comma.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Comma.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Enum.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Enum.html
index f208c95f..f208c95f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Enum.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Enum.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_For.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_For.html
index 3aa455f9..3aa455f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_For.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_For.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_New.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_New.html
index 587844ae..587844ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_New.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_New.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Operator.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Operator.html
index d73c964d..d73c964d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Operator.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Operator.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Paren.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Paren.html
index caa4a5a5..caa4a5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Paren.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Paren.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Template.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Template.html
index d8792888..d8792888 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Space_Template.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Space_Template.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Spaces.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Spaces.html
index eb086a34..a142b00f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/options_Spaces.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/options_Spaces.html
@@ -176,18 +176,26 @@ void * bar()
     <a title="sp_paren_qualifier"><strong><font color="red">               █</font></strong></a>
     void ncName() override;
     <a title="sp_paren_qualifier"><strong><font color="red">             █</font></strong></a>
-template  <  int  ...  X  > int bar2()
-{
-        auto s = sizeof ... (  X  );
-    <a title="sp_sizeof_ellipsis"><strong><font color="red">                   █</font></strong></a><a title="sp_sizeof_ellipsis_paren"><strong><font color="red">   █</font></strong></a>
-        chomp(  X  ) ...;
-    <a title="sp_paren_ellipsis"><strong><font color="red">                █</font></strong></a>
-        return X  +  ...;
-}
+    template < int ... X > int bar2()
+    <a title="sp_type_ellipsis"><strong><font color="red">              █</font></strong></a>
+    {
+            auto s = sizeof ... (  X  );
+        <a title="sp_sizeof_ellipsis"><strong><font color="red">                   █</font></strong></a><a title="sp_sizeof_ellipsis_paren"><strong><font color="red">   █</font></strong></a>
+            chomp(  X  ) ...;
+        <a title="sp_paren_ellipsis"><strong><font color="red">                    █</font></strong></a>
+            return X  +  ...;
+    }
+    do amime3(); while (false);
+    <a title="sp_while_paren_open"><strong><font color="red">                  █</font></strong></a>
+    auto b0 = unknown_kw { 2 };
+    <a title="sp_word_brace_init_lst"><strong><font color="red">                    █</font></strong></a>
     if (data)   go = new ClassA();
     <a title="sp_skip_vbrace_tokens"><strong><font color="red">          █</font></strong></a>
     else        go = new ClassB();
     <a title="sp_skip_vbrace_tokens"><strong><font color="red">          █</font></strong></a>
+
+    auto f0(int a, int b) -> int;
+    <a title="sp_trailing_return"><strong><font color="red">                     █  █</font></strong></a>
 </pre>
 </td>
 </tr>
@@ -374,11 +382,13 @@ void Initialize( BYTE nDelay = 100 );
 <a title="sp_assign_default"><strong><font color="red">                            █ █</font></strong></a>
 void f1()
 {
-      auto a = [ = ] (int *a, Something & b)
-      <a title="sp_cpp_lambda_assign"><strong><font color="red">          █ █</a><a title="sp_square_fparen"> █</font></strong></a>
+      auto a = [<a title="sp_inside_square"><font color="red">█</font></a>=<a title="sp_inside_square"><font color="red">█</font></a>]<a title="sp_cpp_lambda_square_paren"><font color="red">█</font></a>(<a title="sp_cpp_lambda_argument_list"><font color="red">█</font></a>int *a, Something & b<a title="sp_cpp_lambda_argument_list"><font color="red">█</font></a>);
+
+      parallel_for(0, 100, [<a title="sp_inside_square"><font color="red">█</font></a>&<a title="sp_inside_square"><font color="red">█</font></a>]<a title="sp_cpp_lambda_square_paren"><font color="red">█</font></a>(<a title="sp_cpp_lambda_argument_list"><font color="red">█</font></a>const int i<a title="sp_cpp_lambda_argument_list"><font color="red">█</font></a>)<a title="sp_cpp_lambda_paren_brace"><font color="red">█</font></a>{
+          const std::vector<int> values = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
 
       list[idx] (param);
-      <a title="sp_square_fparen"><strong><font color="red">         █</font></strong></a>
+      <a title="sp_square_fparen"><font color="red">         █</font></a>
 
 double foo()
 {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/project-support.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/project-support.jpg
index 5d15550f..5d15550f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/project-support.jpg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/project-support.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/uncrustify.css b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.css
index 240171e9..240171e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/uncrustify.css
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.css
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/uncrustify.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.html
index 0528eb63..0528eb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/htdocs/uncrustify.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/htdocs/uncrustify.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/overview.odt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/overview.odt
index e14e3285..e14e3285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/overview.odt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/overview.odt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/paren_stack.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/paren_stack.txt
index 109709dc..109709dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/paren_stack.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/paren_stack.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/theory.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/theory.txt
index 99324855..99324855 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/theory.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/theory.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/threads.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/threads.txt
index f6ed4edd..f6ed4edd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/documentation/threads.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/threads.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/track.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/track.html
new file mode 100644
index 00000000..e49e4370
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/documentation/track.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+   <title>Uncrustify: where do the Spaces options work</title>
+</head>
+<body lang="en-US">
+<p>
+</p>
+<pre>
+{
+        a<a title="1,8,sp_assign"><font color="red">M</font></a>=<a title="2,9,16,sp_assign"><font color="red">M</font><
+/a>b<a title="3,10,17,22,sp_arith"><font color="red">M</font></a>+<a title="4,11,18,23,27,sp_arith"><font color="red">M<
+/font></a>111<a title="5,12,19,24,28,31,sp_arith"><font color="red">M</font></a>-<a title="6,13,20,25,29,32,34,sp_arith"
+><font color="red">M</font></a>55<a title="7,14,21,26,30,33,35,36,sp_before_semi"><font color="red">M</font></a>;
+}
+</pre>
+</body>
+</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMakeLists.txt
index 72b6efa3..72b6efa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMakeLists.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/CMake_catFiles.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_catFiles.cmake
index c637ea24..c637ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/CMake_catFiles.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_catFiles.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/CMake_emscripten_test.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_emscripten_test.cmake
index a37ee945..a37ee945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/CMake_emscripten_test.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/CMake_emscripten_test.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/README.md
index 22012383..22012383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/README.md
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/build.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/build.sh
index df4b6fe3..df4b6fe3 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/build.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/build.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/libUncrustify.d.ts b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/libUncrustify.d.ts
index 1e7b7fb6..1e7b7fb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/libUncrustify.d.ts
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/libUncrustify.d.ts
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/postfix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_file
index 17315134..17315134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/postfix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/postfix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_module.js
index cbf8f57b..cbf8f57b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/postfix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/postfix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/prefix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_file
index 6a6b5e98..6a6b5e98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/prefix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/prefix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_module.js
index 05d09cd7..05d09cd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/prefix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/prefix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/test/run_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/run_tests.py
index c7a4fcae..c7a4fcae 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/test/run_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/run_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/test/test_run.js b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/test_run.js
index 27627094..27627094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/emscripten/test/test_run.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/emscripten/test/test_run.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/MS-calling_conventions.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/MS-calling_conventions.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/MS-calling_conventions.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/MS-calling_conventions.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/amxmodx.cfg
index 7e435971..7e435971 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/amxmodx.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/ben.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben.cfg
index 88dc170c..aeb4ba0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/ben.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben.cfg
@@ -1,5 +1,3 @@
-# Uncrustify 0.62
-
 #
 # General options
 #
@@ -36,9 +34,6 @@ enable_processing_cmt                     = ""         # string
 # Enable parsing of digraphs. Default=false
 enable_digraphs                           = false    # false/true
 
-# 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    # false/true
 
@@ -290,42 +285,12 @@ sp_arith                                  = force    # ignore/add/remove/force
 # Add or remove space around assignment operator '=', '+=', etc
 sp_assign                                 = force    # ignore/add/remove/force
 
-# 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.
-sp_cpp_lambda_paren                       = ignore   # ignore/add/remove/force
-
-# 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.
-sp_before_assign                          = ignore   # ignore/add/remove/force
-
-# 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 ('
-sp_enum_paren                             = ignore   # ignore/add/remove/force
-
-# 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.
-sp_enum_before_assign                     = ignore   # ignore/add/remove/force
-
-# 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 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.
 sp_pp_stringify                           = add      # ignore/add/remove/force
 
-# 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 '||'
 sp_bool                                   = force    # ignore/add/remove/force
 
@@ -338,66 +303,27 @@ sp_inside_paren                           = remove   # ignore/add/remove/force
 # Add or remove space between nested parens: '((' vs ') )'
 sp_paren_paren                            = remove   # ignore/add/remove/force
 
-# Add or remove space between back-to-back parens: ')(' vs ') ('
-sp_cparen_oparen                          = ignore   # ignore/add/remove/force
-
 # 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 before pointer star '*'
 sp_before_ptr_star                        = force    # 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.
-sp_before_unnamed_ptr_star                = ignore   # ignore/add/remove/force
-
 # Add or remove space between pointer stars '*'
 sp_between_ptr_star                       = remove   # ignore/add/remove/force
 
 # Add or remove space after pointer star '*', if followed by a word.
 sp_after_ptr_star                         = remove   # ignore/add/remove/force
 
-# 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 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 paren (function types).
-sp_ptr_star_paren                         = ignore   # ignore/add/remove/force
-
-# 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                           = remove   # 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.
-sp_before_unnamed_byref                   = ignore   # ignore/add/remove/force
-
 # Add or remove space after reference sign '&', if followed by a word.
 sp_after_byref                            = force    # ignore/add/remove/force
 
-# 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 func proto/def.
-sp_before_byref_func                      = ignore   # ignore/add/remove/force
-
 # Add or remove space between type and word. Default=Force
 sp_after_type                             = force    # ignore/add/remove/force
 
-# 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 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 '<>'
 sp_before_angle                           = remove   # ignore/add/remove/force
 
@@ -407,12 +333,6 @@ sp_inside_angle                           = remove   # ignore/add/remove/force
 # Add or remove space after '<>'
 sp_after_angle                            = force    # ignore/add/remove/force
 
-# Add or remove space between '<>' and '(' as found in 'new List<byte>();'
-sp_angle_paren                            = ignore   # ignore/add/remove/force
-
-# 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 C++/C# only). Default=Add
 sp_angle_shift                            = add      # ignore/add/remove/force
 
@@ -426,33 +346,15 @@ sp_before_sparen                          = force    # ignore/add/remove/force
 # Add or remove space inside if-condition '(' and ')'
 sp_inside_sparen                          = remove   # ignore/add/remove/force
 
-# 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 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                           = force    # ignore/add/remove/force
 
 # Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while', etc.
 sp_sparen_brace                           = add      # ignore/add/remove/force
 
-# Add or remove space between 'invariant' and '(' in the D language.
-sp_invariant_paren                        = ignore   # ignore/add/remove/force
-
-# 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
 sp_before_semi                            = remove   # ignore/add/remove/force
 
-# Add or remove space before ';' in non-empty 'for' statements
-sp_before_semi_for                        = ignore   # ignore/add/remove/force
-
 # Add or remove space before a semicolon of an empty part of a for statement.
 sp_before_semi_for_empty                  = force    # ignore/add/remove/force
 
@@ -462,15 +364,6 @@ sp_after_semi                             = add      # ignore/add/remove/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: for ( ; ; <here> ).
-sp_after_semi_for_empty                   = ignore   # ignore/add/remove/force
-
-# Add or remove space before '[' (except '[]')
-sp_before_square                          = ignore   # ignore/add/remove/force
-
-# Add or remove space before '[]'
-sp_before_squares                         = ignore   # ignore/add/remove/force
-
 # Add or remove space inside a non-empty '[' and ']'
 sp_inside_square                          = remove   # ignore/add/remove/force
 
@@ -480,57 +373,18 @@ sp_after_comma                            = force    # ignore/add/remove/force
 # Add or remove space before ','
 sp_before_comma                           = remove   # ignore/add/remove/force
 
-# Add or remove space between ',' and ']' in multidimensional array type 'int[,,]'
-sp_after_mdatype_commas                   = ignore   # ignore/add/remove/force
-
-# Add or remove space between '[' and ',' in multidimensional array type 'int[,,]'
-sp_before_mdatype_commas                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between ',' in multidimensional array type 'int[,,]'
-sp_between_mdatype_commas                 = ignore   # ignore/add/remove/force
-
 # Add or remove space between an open paren and comma: '(,' vs '( ,'
 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 after class ':'
-sp_after_class_colon                      = ignore   # ignore/add/remove/force
-
-# Add or remove space before class ':'
-sp_before_class_colon                     = ignore   # ignore/add/remove/force
-
-# Add or remove space after class constructor ':'
-sp_after_constr_colon                     = ignore   # ignore/add/remove/force
-
-# Add or remove space before class constructor ':'
-sp_before_constr_colon                    = ignore   # ignore/add/remove/force
-
 # 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 paren, as in 'operator ++('
-sp_after_operator_sym                     = 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'
 sp_after_cast                             = remove   # ignore/add/remove/force
 
-# 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 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                           = remove   # ignore/add/remove/force
 
-# Add or remove space after the tag keyword (Pawn)
-sp_after_tag                              = ignore   # ignore/add/remove/force
-
 # Add or remove space inside enum '{' and '}'
 sp_inside_braces_enum                     = force    # ignore/add/remove/force
 
@@ -540,9 +394,6 @@ sp_inside_braces_struct                   = force    # ignore/add/remove/force
 # Add or remove space inside '{' and '}'
 sp_inside_braces                          = force    # ignore/add/remove/force
 
-# 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.
 sp_type_func                              = force    # ignore/add/remove/force
@@ -553,103 +404,27 @@ sp_func_proto_paren                       = remove   # ignore/add/remove/force
 # Add or remove space between function name and '(' on function definition
 sp_func_def_paren                         = remove   # ignore/add/remove/force
 
-# Add or remove space inside empty function '()'
-sp_inside_fparens                         = ignore   # ignore/add/remove/force
-
 # Add or remove space inside function '(' and ')'
 sp_inside_fparen                          = remove   # ignore/add/remove/force
 
-# 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 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.
-sp_square_fparen                          = ignore   # ignore/add/remove/force
-
 # Add or remove space between ')' and '{' of function
 sp_fparen_brace                           = add      # ignore/add/remove/force
 
-# 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                        = remove   # 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.
-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, like this: 'set func_call_user _' in the config file.
-sp_func_call_user_paren                   = ignore   # ignore/add/remove/force
-
 # Add or remove space between a constructor/destructor and the open paren
 sp_func_class_paren                       = remove   # ignore/add/remove/force
 
 # Add or remove space between 'return' and '('
 sp_return_paren                           = remove   # ignore/add/remove/force
 
-# Add or remove space between '__attribute__' and '('
-sp_attribute_paren                        = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'
-sp_defined_paren                          = ignore   # ignore/add/remove/force
-
-# 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 [...];'
-sp_after_throw                            = ignore   # ignore/add/remove/force
-
-# 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
-
-# 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
-
-# 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 macro and value
-sp_macro                                  = ignore   # ignore/add/remove/force
-
-# 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
-sp_else_brace                             = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'else' if on the same line
-sp_brace_else                             = ignore   # ignore/add/remove/force
-
 # Add or remove space between '}' and the name of a typedef on the same line
 sp_brace_typedef                          = force    # ignore/add/remove/force
 
-# Add or remove space between 'catch' and '{' if on the same line
-sp_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
-
-# Add or remove space between 'finally' and '{' if on the same line
-sp_finally_brace                          = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'finally' if on the same line
-sp_brace_finally                          = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'try' and '{' if on the same line
-sp_try_brace                              = ignore   # ignore/add/remove/force
-
-# 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
-sp_word_brace                             = add      # ignore/add/remove/force
+# Add or remove space between type and open brace of an unnamed temporary
+# direct-list-initialization.
+sp_type_brace_init_lst                    = add      # ignore/add/remove/force
 
 # Add or remove space between a variable and '{' for a namespace
 sp_word_brace_ns                          = add      # ignore/add/remove/force
@@ -660,9 +435,6 @@ sp_before_dc                              = remove   # ignore/add/remove/force
 # Add or remove space after the '::' operator
 sp_after_dc                               = remove   # ignore/add/remove/force
 
-# 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) operator. Default=Remove
 sp_not                                    = remove   # ignore/add/remove/force
 
@@ -689,133 +461,18 @@ sp_incdec                                 = remove   # ignore/add/remove/force
 # 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
 
-# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'
-sp_after_oc_scope                         = ignore   # ignore/add/remove/force
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# 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
-
-# Add or remove space between the receiver and selector in a message.
-# '[receiver selector ...]'
-sp_after_oc_msg_receiver                  = ignore   # ignore/add/remove/force
-
-# Add or remove space after @property.
-sp_after_oc_property                      = 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.
-sp_cond_colon_before                      = ignore   # ignore/add/remove/force
-
-# 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.
-sp_cond_question_before                   = ignore   # ignore/add/remove/force
-
-# 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/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.
 sp_case_label                             = remove   # ignore/add/remove/force
 
-# Control the space around the D '..' operator.
-sp_range                                  = ignore   # ignore/add/remove/force
-
-# Control the spacing after ':' in 'for (TYPE VAR : EXPR)'
-sp_after_for_colon                        = ignore   # ignore/add/remove/force
-
-# Control the spacing before ':' in 'for (TYPE VAR : EXPR)'
-sp_before_for_colon                       = ignore   # ignore/add/remove/force
-
-# Control the spacing in 'extern (C)' (D)
-sp_extern_paren                           = ignore   # ignore/add/remove/force
-
-# Control the space after the opening of a C++ comment '// A' vs '//A'
-sp_cmt_cpp_start                          = ignore   # ignore/add/remove/force
-
 # 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
 
-# Controls the spaces between #else or #endif and a trailing comment
-sp_endif_cmt                              = ignore   # ignore/add/remove/force
-
-# Controls the spaces after 'new', 'delete', and 'delete[]'
-sp_after_new                              = ignore   # ignore/add/remove/force
-
-# Controls the spaces between new and '(' in 'new()'
-sp_between_new_paren                      = ignore   # ignore/add/remove/force
-
-# 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        # number
 
-# Control space between a Java annotation and the open paren.
-sp_annotation_paren                       = ignore   # ignore/add/remove/force
-
 #
 # Code alignment (not left column spaces/tabs)
 #
@@ -1042,12 +699,6 @@ nl_end_of_file_min                        = 1        # number
 # Add or remove newline between '=' and '{'
 nl_assign_brace                           = add      # ignore/add/remove/force
 
-# Add or remove newline between '=' and '[' (D only)
-nl_assign_square                          = ignore   # ignore/add/remove/force
-
-# 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
 # 0 = No change (default)
 nl_func_var_def_blk                       = 1        # number
@@ -1095,62 +746,18 @@ nl_if_brace                               = add      # ignore/add/remove/force
 # Add or remove newline between '}' and 'else'
 nl_brace_else                             = add      # ignore/add/remove/force
 
-# 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 '{'
 nl_else_brace                             = add      # ignore/add/remove/force
 
-# Add or remove newline between 'else' and 'if'
-nl_else_if                                = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'finally'
-nl_brace_finally                          = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'finally' and '{'
-nl_finally_brace                          = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'try' and '{'
-nl_try_brace                              = ignore   # ignore/add/remove/force
-
 # Add or remove newline between get/set and '{'
 nl_getset_brace                           = force    # ignore/add/remove/force
 
 # Add or remove newline between 'for' and '{'
 nl_for_brace                              = add      # ignore/add/remove/force
 
-# Add or remove newline between 'catch' and '{'
-nl_catch_brace                            = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'catch'
-nl_brace_catch                            = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ']'
-nl_brace_square                           = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ')' in a function invocation
-nl_brace_fparen                           = ignore   # ignore/add/remove/force
-
 # Add or remove newline between 'while' and '{'
 nl_while_brace                            = add      # ignore/add/remove/force
 
-# Add or remove newline between 'scope (x)' and '{' (D)
-nl_scope_brace                            = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'unittest' and '{' (D)
-nl_unittest_brace                         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'version (x)' and '{' (D)
-nl_version_brace                          = ignore   # ignore/add/remove/force
-
-# 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.
-nl_brace_brace                            = ignore   # ignore/add/remove/force
-
 # Add or remove newline between 'do' and '{'
 nl_do_brace                               = add      # ignore/add/remove/force
 
@@ -1160,9 +767,6 @@ nl_brace_while                            = remove   # ignore/add/remove/force
 # Add or remove newline between 'switch' and '{'
 nl_switch_brace                           = add      # ignore/add/remove/force
 
-# 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    # false/true
@@ -1173,86 +777,12 @@ nl_multi_line_define                      = true     # false/true
 # Whether to put a newline before 'case' statement
 nl_before_case                            = true     # false/true
 
-# Add or remove newline between ')' and 'throw'
-nl_before_throw                           = ignore   # ignore/add/remove/force
-
 # Whether to put a newline after 'case' statement
 nl_after_case                             = true     # 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.
-nl_template_class                         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'class' and '{'
-nl_class_brace                            = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in the class base list
-nl_class_init_args                        = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in the constructor member initialization
-nl_constr_init_args                       = ignore   # ignore/add/remove/force
-
-# 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 {}
-# 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 function scope and name in a definition
-# 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 '('
 nl_func_paren                             = remove   # ignore/add/remove/force
 
-# Add or remove newline between a function name and the opening '(' in the definition
-nl_func_def_paren                         = ignore   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function declaration
-nl_func_decl_start                        = ignore   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function definition
-nl_func_def_start                         = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single                 = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function declaration
-nl_func_decl_args                         = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function definition
-nl_func_def_args                          = ignore   # ignore/add/remove/force
-
-# Add or remove newline before the ')' in a function declaration
-nl_func_decl_end                          = ignore   # ignore/add/remove/force
-
-# Add or remove newline before the ')' in a function definition
-nl_func_def_end                           = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single                   = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single                    = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty                        = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty                         = ignore   # ignore/add/remove/force
-
 # Whether to put each OC message parameter on a separate line
 # See nl_oc_msg_leave_one_liner
 nl_oc_msg_args                            = false    # false/true
@@ -1260,18 +790,9 @@ nl_oc_msg_args                            = false    # false/true
 # Add or remove newline between function signature and '{'
 nl_fdef_brace                             = add      # ignore/add/remove/force
 
-# Add or remove newline between C++11 lambda signature and '{'
-nl_cpp_ldef_brace                         = ignore   # ignore/add/remove/force
-
-# Add or remove a newline between the return keyword and return expression.
-nl_return_expr                            = ignore   # ignore/add/remove/force
-
 # Whether to put a newline after semicolons, except in 'for' statements
 nl_after_semicolon                        = true     # false/true
 
-# Java: Control the newline between the ')' and '{{' of the double brace initializer.
-nl_paren_dbrace_open                      = ignore   # ignore/add/remove/force
-
 # Whether to put a newline after brace open.
 # This also adds a newline before the matching brace close.
 nl_after_brace_open                       = true     # false/true
@@ -1296,52 +817,12 @@ nl_after_brace_close                      = true     # false/true
 # Would add a newline before return in: 'if (foo) a++; return;'
 nl_after_vbrace_close                     = false    # false/true
 
-# 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    # false/true
 
 # Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'. Does not affect the whole-file #ifdef.
 nl_squeeze_ifdef                          = true     # 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
-nl_after_if                               = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'for'
-nl_before_for                             = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'for' statement
-nl_after_for                              = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'while'
-nl_before_while                           = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'while' statement
-nl_after_while                            = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'switch'
-nl_before_switch                          = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'switch' statement
-nl_after_switch                           = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'synchronized'
-nl_before_synchronized                    = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'synchronized' statement
-nl_after_synchronized                     = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'do'
-nl_before_do                              = ignore   # ignore/add/remove/force
-
-# 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/enum
 nl_ds_struct_enum_cmt                     = false    # false/true
 
@@ -1349,14 +830,6 @@ nl_ds_struct_enum_cmt                     = false    # false/true
 # (lower priority than 'eat_blanks_before_close_brace')
 nl_ds_struct_enum_close_brace             = false    # false/true
 
-# Add or remove a newline around a class colon.
-# Related to pos_class_colon, nl_class_init_args, and pos_class_comma.
-nl_class_colon                            = ignore   # ignore/add/remove/force
-
-# Add or remove a newline around a class constructor colon.
-# Related to pos_constr_colon, nl_constr_init_args, and pos_constr_comma.
-nl_constr_colon                           = ignore   # ignore/add/remove/force
-
 # Change simple unbraced if statements into a one-liner
 # 'if(b)\n i++;' => 'if(b) i++;'
 nl_create_if_one_liner                    = false    # false/true
@@ -1373,37 +846,9 @@ nl_create_while_one_liner                 = false    # false/true
 # Positioning options
 #
 
-# The position of arithmetic operators in wrapped expressions
-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/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
 # The position of boolean operators in wrapped expressions
 pos_bool                                  = trail    # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
 
-# The position of comparison operators in wrapped expressions
-pos_compare                               = ignore   # ignore/join/lead/lead_break/lead_force/trail/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/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of the comma in the class base list
-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
-pos_constr_comma                          = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
-# The position of colons between class and base class list
-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
-pos_constr_colon                          = ignore   # ignore/join/lead/lead_break/lead_force/trail/trail_break/trail_force
-
 #
 # Line Splitting options
 #
@@ -1494,9 +939,6 @@ nl_around_cs_property                     = 0        # number
 # 0 = No change.
 nl_between_get_set                        = 0        # number
 
-# Add or remove newline between C# property and the '{'
-nl_property_brace                         = ignore   # ignore/add/remove/force
-
 # Whether to remove blank lines after '{'
 eat_blanks_after_open_brace               = true     # false/true
 
@@ -1515,13 +957,6 @@ nl_before_return                          = false    # false/true
 # Whether to put a blank line after 'return' statements, unless followed by a close brace.
 nl_after_return                           = true     # false/true
 
-# 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
-
-# Controls the newline between two annotations.
-nl_between_annotation                     = ignore   # ignore/add/remove/force
-
 #
 # Code modifying options (non-whitespace)
 #
@@ -1532,9 +967,6 @@ mod_full_brace_do                         = add      # ignore/add/remove/force
 # Add or remove braces on single-line 'for' statement
 mod_full_brace_for                        = add      # ignore/add/remove/force
 
-# Add or remove braces on single-line function definitions. (Pawn)
-mod_full_brace_function                   = ignore   # ignore/add/remove/force
-
 # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
 mod_full_brace_if                         = add      # ignore/add/remove/force
 
@@ -1548,12 +980,6 @@ mod_full_brace_nl                         = 0        # number
 # Add or remove braces on single-line 'while' statement
 mod_full_brace_while                      = add      # ignore/add/remove/force
 
-# Add or remove braces on single-line 'using ()' statement
-mod_full_brace_using                      = ignore   # ignore/add/remove/force
-
-# Add or remove unnecessary paren on 'return' statement
-mod_paren_on_return                       = ignore   # ignore/add/remove/force
-
 # Whether to change optional semicolons to real semicolons
 mod_pawn_semicolon                        = false    # false/true
 
@@ -1698,9 +1124,6 @@ pp_indent_at_level                        = false    # false/true
 # Default=1.
 pp_indent_count                           = 1        # 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 added with pp_space
 pp_space_count                            = 0        # number
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben2.cfg
index 36831d5c..36831d5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/ben2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/d.cfg
index 22690c47..22690c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/d.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/defaults.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/defaults.cfg
index 955e1fa2..e87d42ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/defaults.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/defaults.cfg
@@ -1,4 +1,4 @@
-# Uncrustify_d-0.71.0-250-9c62bb00
+# Uncrustify-0.73.0
 
 #
 # General options
@@ -37,18 +37,16 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
 disable_processing_nl_cont      = false    # true/false
 
 # Specify the marker used in comments to disable processing of part of the
 # file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *INDENT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *INDENT-ON*"     # string
@@ -56,8 +54,14 @@ enable_processing_cmt           = " *INDENT-ON*"     # string
 # Enable parsing of digraphs.
 enable_digraphs                 = false    # true/false
 
+# Option to allow both disable_processing_cmt and enable_processing_cmt
+# strings, if specified, to be interpreted as ECMAScript regular expressions.
+# If true, a regex search will be performed within comments according to the
+# specified patterns in order to disable/enable processing.
+processing_cmt_as_regex         = false    # true/false
+
 # Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
 
 # If the file contains bytes with values between 128 and 255, but is not
 # UTF-8, then output as UTF-8.
@@ -66,179 +70,175 @@ utf8_byte                       = false    # true/false
 # Force the output encoding to UTF-8.
 utf8_force                      = false    # true/false
 
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'while' and '('.
-sp_while_paren_open             = ignore   # ignore/add/remove/force
-
 #
 # Spacing options
 #
 
 # Add or remove space around non-assignment symbolic operators ('+', '/', '%',
 # '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
+sp_arith                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around arithmetic operators '+' and '-'.
 #
 # Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
+sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
+sp_assign                       = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda when
 # an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda with
 # no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> int x <here> ){ ... }'.
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the argument list of a C++11 lambda, as in
 # '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a lambda body and its call operator of an
 # immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=' in a prototype.
 #
 # If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
+sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
+sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
+sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
+sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
+sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around preprocessor '##' concatenation operator.
 #
 # Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
+sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
+sp_bool                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
+sp_compare                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
+sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
+sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
+sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to balance spaces inside nested parentheses.
 sp_balance_nested_parens        = false    # true/false
 
 # Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
+sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
+# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
+sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
+sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_block_caret        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_qualifier     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a pointer star '*', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
+sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after reference sign '&', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
+sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a reference sign '&', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
+sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -251,50 +251,49 @@ sp_before_byref_func            = ignore   # ignore/add/remove/force
 # following word.
 #
 # Default: force
-sp_after_type                   = force    # ignore/add/remove/force
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
+# Add or remove space between 'decltype(...)' and word,
+# brace or function call.
+sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
 
 # (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_template_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_template_angle               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
+sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
+sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
+sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
+sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
+sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_angle_word                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '>' in '>>' (template stuff).
 #
 # Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
 
 # (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
 # that sp_angle_shift cannot remove the space without this option.
@@ -302,632 +301,648 @@ sp_permit_cpp11_shift           = false    # true/false
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
+sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '(' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ')' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
+sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
+sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
+sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
+sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';'.
 #
 # Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
+sp_after_semi                   = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
 # Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
 
 # 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_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
+sp_before_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for a variable definition.
 #
 # Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
+sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
+sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
+sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # (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_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ','.
 #
 # Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between an open parenthesis and comma,
 # i.e. '(,' vs. '( ,'.
 #
 # Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
+sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
+sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
+sp_type_question                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
+sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
+sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
+sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
+sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before case ':'.
 #
 # Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
+sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_operator_sym           = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_cast                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
+sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
+sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
+sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_func                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
+sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_tparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
+sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of a function call in object
 # initialization.
 #
 # Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_user_paren         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
 
 # 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_paren_paren   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a constructor/destructor and the open
 # parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
+sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
+sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
+sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
+sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
+sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space before Objective-C protocol list
 # as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'super' and '(' in 'super (something)'.
 #
 # Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'this' and '(' in 'this (something)'.
 #
 # Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
+sp_macro                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
+sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
+sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
+sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
+sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
+sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
+sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
+sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for C++ uniform
 # initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # 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                = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
+sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
+sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '!' (not) unary operator.
 #
 # Default: remove
-sp_not                          = remove   # ignore/add/remove/force
+sp_not                          = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
 
 # 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                         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
 # Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+sp_member                       = remove   # ignore/add/remove/force/not_defined
 
 # 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                        = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
 #
 # Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
 
 # 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                       = remove   # ignore/add/remove/force/not_defined
 
 # 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               = add      # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
+sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var : <here> expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var <here> : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
+# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 
-# 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
+# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
+# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+# A region marker is defined as a comment which is not preceded by other text
+# (i.e. the comment is the first non-whitespace on the line), and which starts
+# with either 'BEGIN' or 'END'.
+#
+# Overrides sp_cmt_cpp_start.
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+
+# If true, space 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 '//~'.
+# If true, space 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
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
+sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
+sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
+sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # If true, vbrace tokens are dropped to the previous token and skipped.
 sp_skip_vbrace_tokens           = false    # true/false
 
 # Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
+sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
+sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
@@ -1031,6 +1046,12 @@ indent_extern                   = false    # true/false
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Additional indent before the leading base class colon.
+# Negative values decrease indent down to the first column.
+# Requires a newline break before colon (see pos_class_colon
+# and nl_class_colon)
+indent_before_class_colon       = 0        # number
+
 # Whether to indent the stuff after a leading base class colon.
 indent_class_colon              = false    # true/false
 
@@ -1142,8 +1163,14 @@ indent_sparen_extra             = 0        # number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# It might wise to choose the same value for the option indent_case_brace.
 indent_switch_case              = 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.
+# It might wise to choose the same value for the option indent_switch_case.
+indent_case_brace               = 0        # number
+
 # indent 'break' with 'case' from 'switch'.
 indent_switch_break_with_case   = false    # true/false
 
@@ -1156,10 +1183,6 @@ indent_switch_pp                = true     # true/false
 # 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.
-indent_case_brace               = 0        # number
-
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
@@ -1210,6 +1233,10 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
+# Whether to indent a comma when inside a brace.
+# If true, aligns under the open brace.
+indent_comma_brace              = false    # true/false
+
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
 indent_comma_paren              = false    # true/false
@@ -1316,10 +1343,10 @@ indent_token_after_brace        = true     # true/false
 indent_cpp_lambda_body          = false    # true/false
 
 # How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
+# true: add both the indent from return & the compound literal open brace
+#       (i.e. 2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only
+#        add the indent for the return.
 #
 # Default: true
 indent_compound_literal_return  = true     # true/false
@@ -1336,7 +1363,7 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
-# Whether to indent the statments inside ternary operator.
+# Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
 
 # If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
@@ -1392,6 +1419,9 @@ nl_if_leave_one_liners          = false    # true/false
 # Don't split one-line while statements, as in 'while(...) b++;'.
 nl_while_leave_one_liners       = false    # true/false
 
+# Don't split one-line do statements, as in 'do { b++; } while(...);'.
+nl_do_leave_one_liners          = false    # true/false
+
 # Don't split one-line for statements, as in 'for(...) b++;'.
 nl_for_leave_one_liners         = false    # true/false
 
@@ -1399,166 +1429,166 @@ nl_for_leave_one_liners         = false    # true/false
 nl_oc_msg_leave_one_liner       = false    # true/false
 
 # (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
+nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline after '= ['. Will also affect the newline before
 # the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
+nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
+nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
+nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
+nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
+nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
+nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
+nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
+nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
+nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
+nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
+nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
+nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
+nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
+nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
+nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
+nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline between ')' and '{' if the ')' is on a different line than the
 # if/for/etc.
@@ -1569,11 +1599,11 @@ nl_multi_line_cond              = false    # true/false
 
 # Add a newline after '(' if an if/for/while/switch condition spans multiple
 # lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline before ')' if an if/for/while/switch condition spans multiple
 # lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
 
 # Force a newline in a define after the macro name for multi-line defines.
 nl_multi_line_define            = false    # true/false
@@ -1588,141 +1618,141 @@ nl_after_case                   = false    # true/false
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
+nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
+nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
+nl_template_class               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class declaration.
 #
 # Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
+nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class declaration.
 #
 # Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class definition.
 #
 # Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
+nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class definition.
 #
 # Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
+nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
+nl_template_func                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # declaration.
 #
 # Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
+nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # declaration.
 #
 # Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # definition.
 #
 # Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
+nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # definition.
 #
 # Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
+nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
+nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'template<...>' and 'using' of a templated
 # type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
+nl_template_using               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
+nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before or after (depending on pos_class_comma,
 # may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
+nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between return type and function name in a function
 # definition.
 # might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
+nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_name_class         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_class_scope             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_scope_name              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
 
 # 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                   = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
+nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
 
 # 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               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # 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              = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
+nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
+nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
+nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1733,13 +1763,13 @@ nl_func_decl_start_multi_line   = false    # true/false
 nl_func_def_start_multi_line    = false    # true/false
 
 # Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
+nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
+nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
+nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1750,16 +1780,16 @@ nl_func_decl_args_multi_line    = false    # true/false
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
+nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1770,20 +1800,20 @@ nl_func_decl_end_multi_line     = false    # true/false
 nl_func_def_end_multi_line      = false    # true/false
 
 # Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call,
 # has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
+nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
+nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -1797,7 +1827,7 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
-# Whether to respect nl_func_call_XXX option incase of closure args.
+# Whether to respect nl_func_call_XXX option in case of closure args.
 nl_func_call_args_multi_line_ignore_closures = false    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
@@ -1814,36 +1844,36 @@ nl_template_end                 = false    # true/false
 nl_oc_msg_args                  = false    # true/false
 
 # Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
+nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between function signature and '{',
 # if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
 # (Java) Add or remove newline between the ')' and '{{' of the double brace
 # initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # 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          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_open     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '{'. This also adds a newline before the
 # matching '}'.
@@ -1872,7 +1902,7 @@ 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.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to alter newlines in '#define' macros.
 nl_define_macro                 = false    # true/false
@@ -1890,41 +1920,41 @@ nl_squeeze_ifdef                = false    # true/false
 nl_squeeze_ifdef_top_level      = false    # true/false
 
 # Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_if                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to put a blank line before 'return' statements, unless after an open
 # brace.
@@ -1935,10 +1965,10 @@ nl_before_return                = false    # true/false
 nl_after_return                 = false    # true/false
 
 # Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
+nl_before_member                = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
+nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to double-space commented-entries in 'struct'/'union'/'enum'.
 nl_ds_struct_enum_cmt           = false    # true/false
@@ -1949,11 +1979,11 @@ nl_ds_struct_enum_close_brace   = false    # true/false
 
 # 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_class_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -1977,9 +2007,8 @@ nl_create_while_one_liner       = false    # true/false
 # a single line.
 nl_create_func_def_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.
+# Whether to split one-line simple unbraced if statements into three lines by
+# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 nl_create_list_one_liner        = false    # true/false
 
 # Whether to split one-line simple unbraced if statements into two lines by
@@ -2009,13 +2038,16 @@ nl_max                          = 0        # unsigned number
 nl_max_blank_in_func            = 0        # unsigned number
 
 # The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
+# This option overrides eat_blanks_after_open_brace and
+# eat_blanks_before_close_brace, but is ignored when
+# nl_collapse_empty_body=true
 nl_inside_empty_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.
+# The number of newlines before a multi-line function definition. Where
+# applicable, this option is overridden with eat_blanks_after_open_brace=true
 nl_before_func_body_def         = 0        # unsigned number
 
 # The number of newlines before a class constructor/destructor prototype.
@@ -2183,7 +2215,7 @@ nl_around_cs_property           = 0        # unsigned number
 nl_between_get_set              = 0        # unsigned number
 
 # (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
+nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove blank lines after '{'.
 eat_blanks_after_open_brace     = false    # true/false
@@ -2200,10 +2232,10 @@ nl_remove_extra_newlines        = 0        # unsigned number
 
 # (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
+nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
+nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
 
 # The number of newlines before a whole-file #ifdef.
 #
@@ -2617,9 +2649,44 @@ cmt_width                       = 0        # unsigned number
 #
 # 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
 # 1: No touching at all
-# 2: Full reflow
+# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
 cmt_reflow_mode                 = 0        # unsigned number
 
+# Path to a file that contains regular expressions describing patterns for
+# which the end of one line and the beginning of the next will be folded into
+# the same sentence or paragraph during full comment reflow. The regular
+# expressions are described using ECMAScript syntax. The syntax for this
+# specification is as follows, where "..." indicates the custom regular
+# expression and "n" indicates the nth end_of_prev_line_regex and
+# beg_of_next_line_regex regular expression pair:
+#
+# end_of_prev_line_regex[1] = "...$"
+# beg_of_next_line_regex[1] = "^..."
+# end_of_prev_line_regex[2] = "...$"
+# beg_of_next_line_regex[2] = "^..."
+#             .
+#             .
+#             .
+# end_of_prev_line_regex[n] = "...$"
+# beg_of_next_line_regex[n] = "^..."
+#
+# Note that use of this option overrides the default reflow fold regular
+# expressions, which are internally defined as follows:
+#
+# end_of_prev_line_regex[1] = "[\w,\]\)]$"
+# beg_of_next_line_regex[1] = "^[\w,\[\(]"
+# end_of_prev_line_regex[2] = "\.$"
+# beg_of_next_line_regex[2] = "^[A-Z]"
+cmt_reflow_fold_regex_file      = ""         # string
+
+# Whether to indent wrapped lines to the start of the encompassing paragraph
+# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+# specified by cmt_sp_after_star_cont.
+#
+# Note that cmt_align_doxygen_javadoc_tags overrides this option for
+# paragraphs associated with javadoc tags
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+
 # 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
@@ -2630,6 +2697,22 @@ cmt_convert_tab_to_spaces       = false    # true/false
 # Default: true
 cmt_indent_multi                = true     # true/false
 
+# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+# and corresponding fields such that groups of consecutive block tags,
+# parameter names, and descriptions align with one another. Overrides that
+# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+# in order to achieve the desired alignment for line-wrapping.
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+
+# The number of spaces to insert after the star and before doxygen
+# javadoc-style tags (@param, @return, etc). Requires enabling
+# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+# cmt_sp_after_star_cont.
+#
+# Default: 1
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+
 # Whether to group c-comments that look like they are in a block.
 cmt_c_group                     = false    # true/false
 
@@ -2736,17 +2819,17 @@ cmt_insert_before_ctor_dtor     = false    # true/false
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
+mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
+mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
+mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_if               = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -2762,10 +2845,10 @@ mod_full_brace_if_chain         = false    # true/false
 mod_full_brace_if_chain_only    = false    # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
+mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
+mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl               = 0        # unsigned number
@@ -2787,7 +2870,7 @@ mod_full_brace_nl               = 0        # unsigned number
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
 # Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
@@ -2862,14 +2945,14 @@ mod_move_case_break             = false    # true/false
 
 # 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_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
@@ -2904,7 +2987,7 @@ mod_sort_oc_property_nullability_weight = 0        # number
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Whether to indent #if/#else/#endif at the brace level. If false, these are
 # indented from column 1.
@@ -2919,7 +3002,7 @@ pp_indent_at_level              = false    # true/false
 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
+pp_space                        = ignore   # ignore/add/remove/force/not_defined
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 0        # unsigned number
@@ -3042,9 +3125,8 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
+# If true: the form feed character is removed from the list of whitespace
+# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
 use_form_feed_no_more_as_whitespace_character = false    # true/false
 
 #
@@ -3072,6 +3154,10 @@ debug_line_number_to_protocol   = 0        # number
 # only for linux
 debug_timeout                   = 0        # number
 
+# Set the number of characters to be printed if the text is too long,
+# 0: do not truncate.
+debug_truncate                  = 0        # unsigned number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/dofiles.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/dofiles.sh
index e08fd6f7..e08fd6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/dofiles.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/dofiles.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/freebsd.cfg
index 985ab50c..ec5e2c96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/freebsd.cfg
@@ -167,6 +167,7 @@ sp_case_label                            = remove
 sp_range                                 = ignore
 sp_cmt_cpp_start                         = ignore
 sp_endif_cmt                             = ignore
+force_tab_after_define                   = true
 align_keep_tabs                          = false
 align_with_tabs                          = true
 align_on_tabstop                         = true
@@ -304,7 +305,7 @@ pos_conditional                          = ignore
 pos_comma                                = ignore
 pos_class_comma                          = ignore
 pos_class_colon                          = ignore
-code_width                               = 0
+code_width                               = 80
 ls_for_split_full                        = false
 ls_func_split_full                       = false
 nl_max                                   = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/gnu-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/gnu-indent.cfg
index d4e8efea..d4e8efea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/gnu-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/gnu-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/klaus.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/klaus.cfg
index 97857198..97857198 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/klaus.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/klaus.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/kr-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/kr-indent.cfg
index 5eea56c3..5eea56c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/kr-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/kr-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/linux-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux-indent.cfg
index d6baa165..d6baa165 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/linux-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/linux.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux.cfg
index c3fb724b..c3fb724b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/linux.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/linux.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/mono.cfg
index 9987e9d6..9987e9d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/mono.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/msvc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/msvc.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/msvc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/msvc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/objc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/objc.cfg
index d3321f09..d3321f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/objc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/objc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/sun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/sun.cfg
index 21e839ca..42b780cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/sun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/sun.cfg
@@ -1,5 +1,3 @@
-# Uncrustify 0.62
-
 #
 # Sun C/C++/Java
 # https://www.cis.upenn.edu/~lee/06cse480/data/cstyle.ms.pdf
@@ -38,9 +36,6 @@ enable_processing_cmt                     = ""         # string
 # Enable parsing of digraphs. Default=false
 enable_digraphs                           = false    # false/true
 
-# 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    # false/true
 
@@ -299,9 +294,6 @@ sp_assign                                 = force    # ignore/add/remove/force
 # Add or remove space around '=' in C++11 lambda capture specifications. Overrides sp_assign
 sp_cpp_lambda_assign                      = force    # ignore/add/remove/force
 
-# Add or remove space after the capture specification in C++11 lambda.
-sp_cpp_lambda_paren                       = force    # ignore/add/remove/force
-
 # Add or remove space around assignment operator '=' in a prototype
 sp_assign_default                         = force    # ignore/add/remove/force
 
@@ -654,8 +646,9 @@ sp_try_brace                              = force    # ignore/add/remove/force
 # Add or remove space between get/set and '{' if on the same line
 sp_getset_brace                           = force    # ignore/add/remove/force
 
-# Add or remove space between a variable and '{' for C++ uniform initialization
-sp_word_brace                             = force    # ignore/add/remove/force
+# Add or remove space between type and open brace of an unnamed temporary
+# direct-list-initialization.
+sp_type_brace_init_lst                    = add      # ignore/add/remove/force
 
 # Add or remove space between a variable and '{' for a namespace
 sp_word_brace_ns                          = force    # ignore/add/remove/force
@@ -1535,9 +1528,6 @@ nl_after_return                           = false    # false/true
 # Only affects annotations that are after a newline.
 nl_after_annotation                       = force    # ignore/add/remove/force
 
-# Controls the newline between two annotations.
-nl_between_annotation                     = ignore   # ignore/add/remove/force
-
 #
 # Code modifying options (non-whitespace)
 #
@@ -1548,9 +1538,6 @@ mod_full_brace_do                         = force    # ignore/add/remove/force
 # Add or remove braces on single-line 'for' statement
 mod_full_brace_for                        = remove   # ignore/add/remove/force
 
-# Add or remove braces on single-line function definitions. (Pawn)
-mod_full_brace_function                   = ignore   # ignore/add/remove/force
-
 # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
 mod_full_brace_if                         = remove   # ignore/add/remove/force
 
@@ -1612,10 +1599,6 @@ mod_sort_include                          = false    # false/true
 # 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
 
-# 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
-
 # If TRUE, it will remove a void 'return;' that appears as the last statement in a function.
 mod_remove_empty_return                   = true     # false/true
 
@@ -1703,9 +1686,6 @@ cmt_insert_before_preproc                 = false    # false/true
 # Preprocessor options
 #
 
-# 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 (true) or from column 1 (false)
 pp_indent_at_level                        = false    # false/true
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/types.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/types.txt
index 0df27c78..0df27c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/types.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/types.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uigui_uncrustify.ini b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uigui_uncrustify.ini
new file mode 100644
index 00000000..d52c0288
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uigui_uncrustify.ini
@@ -0,0 +1,6712 @@
+[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
+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
+indenterFileName=uncrustify
+indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
+inputFileName=indentinput
+inputFileParameter="-f "
+manual=http://uncrustify.sourceforge.net/config.txt
+outputFileName=indentoutput
+outputFileParameter="-o "
+stringparaminquotes=false
+parameterOrder=ipo
+showHelpParameter=-h
+stringparaminquotes=false
+useCfgFileParameter="-c "
+version=Uncrustify-0.73.0
+
+[Newlines]
+Category=0
+Description="<html>The type of line endings.<br/><br/>Default: auto</html>"
+Enabled=false
+EditorType=multiple
+Choices=newlines=lf|newlines=crlf|newlines=cr|newlines=auto
+ChoicesReadable="Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto"
+ValueDefault=auto
+
+[Input Tab Size]
+Category=0
+Description="<html>The original size of tabs in the input.<br/><br/>Default: 8</html>"
+Enabled=false
+EditorType=numeric
+CallName="input_tab_size="
+MinVal=1
+MaxVal=32
+ValueDefault=8
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="output_tab_size="
+MinVal=1
+MaxVal=32
+ValueDefault=8
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="string_escape_char="
+MinVal=0
+MaxVal=255
+ValueDefault=92
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="string_escape_char2="
+MinVal=0
+MaxVal=255
+ValueDefault=0
+
+[String Replace Tab Chars]
+Category=0
+Description="<html>Replace tab characters found in string literals with the escape sequence \t<br/>instead.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=string_replace_tab_chars=true|string_replace_tab_chars=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=tok_split_gte=true|tok_split_gte=false
+ValueDefault=false
+
+[Disable Processing Nl Cont]
+Category=0
+Description="<html>Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=disable_processing_nl_cont=true|disable_processing_nl_cont=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+CallName=disable_processing_cmt=
+EditorType=string
+ValueDefault= *INDENT-OFF*
+
+[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>"
+Enabled=false
+CallName=enable_processing_cmt=
+EditorType=string
+ValueDefault= *INDENT-ON*
+
+[Enable Digraphs]
+Category=0
+Description="<html>Enable parsing of digraphs.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=enable_digraphs=true|enable_digraphs=false
+ValueDefault=false
+
+[Processing Cmt As Regex]
+Category=0
+Description="<html>Option to allow both disable_processing_cmt and enable_processing_cmt<br/>strings, if specified, to be interpreted as ECMAScript regular expressions.<br/>If true, a regex search will be performed within comments according to the<br/>specified patterns in order to disable/enable processing.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=processing_cmt_as_regex=true|processing_cmt_as_regex=false
+ValueDefault=false
+
+[Utf8 Bom]
+Category=0
+Description="<html>Add or remove the UTF-8 BOM (recommend 'remove').</html>"
+Enabled=false
+EditorType=multiple
+Choices=utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force|utf8_bom=not_defined
+ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=utf8_byte=true|utf8_byte=false
+ValueDefault=false
+
+[Utf8 Force]
+Category=0
+Description="<html>Force the output encoding to UTF-8.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=utf8_force=true|utf8_force=false
+ValueDefault=false
+
+[Sp Arith]
+Category=1
+Description="<html>Add or remove space around non-assignment symbolic operators ('+', '/', '%',<br/>'&lt;&lt;', and so forth).</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_arith=ignore|sp_arith=add|sp_arith=remove|sp_arith=force|sp_arith=not_defined
+ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith"
+ValueDefault=ignore
+
+[Sp Arith Additive]
+Category=1
+Description="<html>Add or remove space around arithmetic operators '+' and '-'.<br/><br/>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|sp_arith_additive=not_defined
+ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive"
+ValueDefault=ignore
+
+[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|sp_assign=not_defined
+ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
+ValueDefault=ignore
+
+[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>"
+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|sp_cpp_lambda_assign=not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Assign|Add Sp Cpp Lambda Assign|Remove Sp Cpp Lambda Assign|Force Sp Cpp Lambda Assign"
+ValueDefault=ignore
+
+[Sp Cpp Lambda Square Paren]
+Category=1
+Description="<html>Add or remove space after the capture specification of a C++11 lambda when<br/>an argument list is present, as in '[] &lt;here&gt; (int x){ ... }'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_square_paren=ignore|sp_cpp_lambda_square_paren=add|sp_cpp_lambda_square_paren=remove|sp_cpp_lambda_square_paren=force|sp_cpp_lambda_square_paren=not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Square Paren|Add Sp Cpp Lambda Square Paren|Remove Sp Cpp Lambda Square Paren|Force Sp Cpp Lambda Square Paren"
+ValueDefault=ignore
+
+[Sp Cpp Lambda Square Brace]
+Category=1
+Description="<html>Add or remove space after the capture specification of a C++11 lambda with<br/>no argument list is present, as in '[] &lt;here&gt; { ... }'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_square_brace=ignore|sp_cpp_lambda_square_brace=add|sp_cpp_lambda_square_brace=remove|sp_cpp_lambda_square_brace=force|sp_cpp_lambda_square_brace=not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Square Brace|Add Sp Cpp Lambda Square Brace|Remove Sp Cpp Lambda Square Brace|Force Sp Cpp Lambda Square Brace"
+ValueDefault=ignore
+
+[Sp Cpp Lambda Argument List]
+Category=1
+Description="<html>Add or remove space after the opening parenthesis and before the closing<br/>parenthesis of a argument list of a C++11 lambda, as in<br/>'[]( &lt;here&gt; int x &lt;here&gt; ){ ... }'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_argument_list=ignore|sp_cpp_lambda_argument_list=add|sp_cpp_lambda_argument_list=remove|sp_cpp_lambda_argument_list=force|sp_cpp_lambda_argument_list=not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Argument List|Add Sp Cpp Lambda Argument List|Remove Sp Cpp Lambda Argument List|Force Sp Cpp Lambda Argument List"
+ValueDefault=ignore
+
+[Sp Cpp Lambda Paren Brace]
+Category=1
+Description="<html>Add or remove space after the argument list of a C++11 lambda, as in<br/>'[](int x) &lt;here&gt; { ... }'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_paren_brace=ignore|sp_cpp_lambda_paren_brace=add|sp_cpp_lambda_paren_brace=remove|sp_cpp_lambda_paren_brace=force|sp_cpp_lambda_paren_brace=not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Paren Brace|Add Sp Cpp Lambda Paren Brace|Remove Sp Cpp Lambda Paren Brace|Force Sp Cpp Lambda Paren Brace"
+ValueDefault=ignore
+
+[Sp Cpp Lambda Fparen]
+Category=1
+Description="<html>Add or remove space between a lambda body and its call operator of an<br/>immediately invoked lambda, as in '[]( ... ){ ... } &lt;here&gt; ( ... )'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_fparen=ignore|sp_cpp_lambda_fparen=add|sp_cpp_lambda_fparen=remove|sp_cpp_lambda_fparen=force|sp_cpp_lambda_fparen=not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Fparen|Add Sp Cpp Lambda Fparen|Remove Sp Cpp Lambda Fparen|Force Sp Cpp Lambda Fparen"
+ValueDefault=ignore
+
+[Sp Assign Default]
+Category=1
+Description="<html>Add or remove space around assignment operator '=' in a prototype.<br/><br/>If set to ignore, use sp_assign.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_assign_default=ignore|sp_assign_default=add|sp_assign_default=remove|sp_assign_default=force|sp_assign_default=not_defined
+ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
+ValueDefault=ignore
+
+[Sp Before Assign]
+Category=1
+Description="<html>Add or remove space before assignment operator '=', '+=', etc.<br/><br/>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|sp_before_assign=not_defined
+ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign"
+ValueDefault=ignore
+
+[Sp After Assign]
+Category=1
+Description="<html>Add or remove space after assignment operator '=', '+=', etc.<br/><br/>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|sp_after_assign=not_defined
+ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
+ValueDefault=ignore
+
+[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|sp_enum_paren=not_defined
+ChoicesReadable="Ignore Sp Enum Paren|Add Sp Enum Paren|Remove Sp Enum Paren|Force Sp Enum Paren"
+ValueDefault=ignore
+
+[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|sp_enum_assign=not_defined
+ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign"
+ValueDefault=ignore
+
+[Sp Enum Before Assign]
+Category=1
+Description="<html>Add or remove space before assignment '=' in enum.<br/><br/>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|sp_enum_before_assign=not_defined
+ChoicesReadable="Ignore Sp Enum Before Assign|Add Sp Enum Before Assign|Remove Sp Enum Before Assign|Force Sp Enum Before Assign"
+ValueDefault=ignore
+
+[Sp Enum After Assign]
+Category=1
+Description="<html>Add or remove space after assignment '=' in enum.<br/><br/>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|sp_enum_after_assign=not_defined
+ChoicesReadable="Ignore Sp Enum After Assign|Add Sp Enum After Assign|Remove Sp Enum After Assign|Force Sp Enum After Assign"
+ValueDefault=ignore
+
+[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|sp_enum_colon=not_defined
+ChoicesReadable="Ignore Sp Enum Colon|Add Sp Enum Colon|Remove Sp Enum Colon|Force Sp Enum Colon"
+ValueDefault=ignore
+
+[Sp Pp Concat]
+Category=1
+Description="<html>Add or remove space around preprocessor '##' concatenation operator.<br/><br/>Default: add</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_pp_concat=ignore|sp_pp_concat=add|sp_pp_concat=remove|sp_pp_concat=force|sp_pp_concat=not_defined
+ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat"
+ValueDefault=add
+
+[Sp Pp Stringify]
+Category=1
+Description="<html>Add or remove space after preprocessor '#' stringify operator.<br/>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|sp_pp_stringify=not_defined
+ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify"
+ValueDefault=ignore
+
+[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>"
+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|sp_before_pp_stringify=not_defined
+ChoicesReadable="Ignore Sp Before Pp Stringify|Add Sp Before Pp Stringify|Remove Sp Before Pp Stringify|Force Sp Before Pp Stringify"
+ValueDefault=ignore
+
+[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|sp_bool=not_defined
+ChoicesReadable="Ignore Sp Bool|Add Sp Bool|Remove Sp Bool|Force Sp Bool"
+ValueDefault=ignore
+
+[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|sp_compare=not_defined
+ChoicesReadable="Ignore Sp Compare|Add Sp Compare|Remove Sp Compare|Force Sp Compare"
+ValueDefault=ignore
+
+[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|sp_inside_paren=not_defined
+ChoicesReadable="Ignore Sp Inside Paren|Add Sp Inside Paren|Remove Sp Inside Paren|Force Sp Inside Paren"
+ValueDefault=ignore
+
+[Sp Paren Paren]
+Category=1
+Description="<html>Add or remove space between nested parentheses, i.e. '((' vs. ') )'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_paren_paren=ignore|sp_paren_paren=add|sp_paren_paren=remove|sp_paren_paren=force|sp_paren_paren=not_defined
+ChoicesReadable="Ignore Sp Paren Paren|Add Sp Paren Paren|Remove Sp Paren Paren|Force Sp Paren Paren"
+ValueDefault=ignore
+
+[Sp Cparen Oparen]
+Category=1
+Description="<html>Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cparen_oparen=ignore|sp_cparen_oparen=add|sp_cparen_oparen=remove|sp_cparen_oparen=force|sp_cparen_oparen=not_defined
+ChoicesReadable="Ignore Sp Cparen Oparen|Add Sp Cparen Oparen|Remove Sp Cparen Oparen|Force Sp Cparen Oparen"
+ValueDefault=ignore
+
+[Sp Balance Nested Parens]
+Category=1
+Description="<html>Whether to balance spaces inside nested parentheses.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_balance_nested_parens=true|sp_balance_nested_parens=false
+ValueDefault=false
+
+[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|sp_paren_brace=not_defined
+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|sp_brace_brace=not_defined
+ChoicesReadable="Ignore Sp Brace Brace|Add Sp Brace Brace|Remove Sp Brace Brace|Force Sp Brace Brace"
+ValueDefault=ignore
+
+[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|sp_before_ptr_star=not_defined
+ChoicesReadable="Ignore Sp Before Ptr Star|Add Sp Before Ptr Star|Remove Sp Before Ptr Star|Force Sp Before Ptr Star"
+ValueDefault=ignore
+
+[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>"
+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|sp_before_unnamed_ptr_star=not_defined
+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
+
+[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|sp_between_ptr_star=not_defined
+ChoicesReadable="Ignore Sp Between Ptr Star|Add Sp Between Ptr Star|Remove Sp Between Ptr Star|Force Sp Between Ptr Star"
+ValueDefault=ignore
+
+[Sp After Ptr Star]
+Category=1
+Description="<html>Add or remove space after pointer star '*', if followed by a word.<br/><br/>Overrides sp_type_func.</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|sp_after_ptr_star=not_defined
+ChoicesReadable="Ignore Sp After Ptr Star|Add Sp After Ptr Star|Remove Sp After Ptr Star|Force Sp After Ptr Star"
+ValueDefault=ignore
+
+[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|sp_after_ptr_block_caret=not_defined
+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
+
+[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|sp_after_ptr_star_qualifier=not_defined
+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
+
+[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.<br/><br/>Overrides sp_after_ptr_star and sp_type_func.</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|sp_after_ptr_star_func=not_defined
+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
+
+[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>"
+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|sp_ptr_star_paren=not_defined
+ChoicesReadable="Ignore Sp Ptr Star Paren|Add Sp Ptr Star Paren|Remove Sp Ptr Star Paren|Force Sp Ptr Star Paren"
+ValueDefault=ignore
+
+[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>"
+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|sp_before_ptr_star_func=not_defined
+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
+
+[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|sp_before_byref=not_defined
+ChoicesReadable="Ignore Sp Before Byref|Add Sp Before Byref|Remove Sp Before Byref|Force Sp Before Byref"
+ValueDefault=ignore
+
+[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>"
+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|sp_before_unnamed_byref=not_defined
+ChoicesReadable="Ignore Sp Before Unnamed Byref|Add Sp Before Unnamed Byref|Remove Sp Before Unnamed Byref|Force Sp Before Unnamed Byref"
+ValueDefault=ignore
+
+[Sp After Byref]
+Category=1
+Description="<html>Add or remove space after reference sign '&amp;', if followed by a word.<br/><br/>Overrides sp_type_func.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_byref=ignore|sp_after_byref=add|sp_after_byref=remove|sp_after_byref=force|sp_after_byref=not_defined
+ChoicesReadable="Ignore Sp After Byref|Add Sp After Byref|Remove Sp After Byref|Force Sp After Byref"
+ValueDefault=ignore
+
+[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.<br/><br/>Overrides sp_after_byref and sp_type_func.</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|sp_after_byref_func=not_defined
+ChoicesReadable="Ignore Sp After Byref Func|Add Sp After Byref Func|Remove Sp After Byref Func|Force Sp After Byref Func"
+ValueDefault=ignore
+
+[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>"
+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|sp_before_byref_func=not_defined
+ChoicesReadable="Ignore Sp Before Byref Func|Add Sp Before Byref Func|Remove Sp Before Byref Func|Force Sp Before Byref Func"
+ValueDefault=ignore
+
+[Sp After Type]
+Category=1
+Description="<html>Add or remove space between type and word. In cases where total removal of<br/>whitespace would be a syntax error, a value of 'remove' is treated the same<br/>as 'force'.<br/><br/>This also affects some other instances of space following a type that are<br/>not covered by other options; for example, between the return type and<br/>parenthesis of a function type template argument, between the type and<br/>parenthesis of an array parameter, or between 'decltype(...)' and the<br/>following word.<br/><br/>Default: force</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_type=ignore|sp_after_type=add|sp_after_type=remove|sp_after_type=force|sp_after_type=not_defined
+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,<br/>brace or function call.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_decltype=ignore|sp_after_decltype=add|sp_after_decltype=remove|sp_after_decltype=force|sp_after_decltype=not_defined
+ChoicesReadable="Ignore Sp After Decltype|Add Sp After Decltype|Remove Sp After Decltype|Force Sp After Decltype"
+ValueDefault=ignore
+
+[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>"
+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|sp_before_template_paren=not_defined
+ChoicesReadable="Ignore Sp Before Template Paren|Add Sp Before Template Paren|Remove Sp Before Template Paren|Force Sp Before Template Paren"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_template_angle=ignore|sp_template_angle=add|sp_template_angle=remove|sp_template_angle=force|sp_template_angle=not_defined
+ChoicesReadable="Ignore Sp Template Angle|Add Sp Template Angle|Remove Sp Template Angle|Force Sp Template Angle"
+ValueDefault=ignore
+
+[Sp Before Angle]
+Category=1
+Description="<html>Add or remove space before '&lt;'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_angle=ignore|sp_before_angle=add|sp_before_angle=remove|sp_before_angle=force|sp_before_angle=not_defined
+ChoicesReadable="Ignore Sp Before Angle|Add Sp Before Angle|Remove Sp Before Angle|Force Sp Before Angle"
+ValueDefault=ignore
+
+[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|sp_inside_angle=not_defined
+ChoicesReadable="Ignore Sp Inside Angle|Add Sp Inside Angle|Remove Sp Inside Angle|Force Sp Inside Angle"
+ValueDefault=ignore
+
+[Sp Inside Angle Empty]
+Category=1
+Description="<html>Add or remove space inside '&lt;&gt;'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_angle_empty=ignore|sp_inside_angle_empty=add|sp_inside_angle_empty=remove|sp_inside_angle_empty=force|sp_inside_angle_empty=not_defined
+ChoicesReadable="Ignore Sp Inside Angle Empty|Add Sp Inside Angle Empty|Remove Sp Inside Angle Empty|Force Sp Inside Angle Empty"
+ValueDefault=ignore
+
+[Sp Angle Colon]
+Category=1
+Description="<html>Add or remove space between '&gt;' and ':'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_angle_colon=ignore|sp_angle_colon=add|sp_angle_colon=remove|sp_angle_colon=force|sp_angle_colon=not_defined
+ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon"
+ValueDefault=ignore
+
+[Sp After Angle]
+Category=1
+Description="<html>Add or remove space after '&gt;'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_angle=ignore|sp_after_angle=add|sp_after_angle=remove|sp_after_angle=force|sp_after_angle=not_defined
+ChoicesReadable="Ignore Sp After Angle|Add Sp After Angle|Remove Sp After Angle|Force Sp After Angle"
+ValueDefault=ignore
+
+[Sp Angle Paren]
+Category=1
+Description="<html>Add or remove space between '&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|sp_angle_paren=not_defined
+ChoicesReadable="Ignore Sp Angle Paren|Add Sp Angle Paren|Remove Sp Angle Paren|Force Sp Angle Paren"
+ValueDefault=ignore
+
+[Sp Angle Paren Empty]
+Category=1
+Description="<html>Add or remove space between '&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|sp_angle_paren_empty=not_defined
+ChoicesReadable="Ignore Sp Angle Paren Empty|Add Sp Angle Paren Empty|Remove Sp Angle Paren Empty|Force Sp Angle Paren Empty"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force|sp_angle_word=not_defined
+ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_angle_shift=ignore|sp_angle_shift=add|sp_angle_shift=remove|sp_angle_shift=force|sp_angle_shift=not_defined
+ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift"
+ValueDefault=add
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_permit_cpp11_shift=true|sp_permit_cpp11_shift=false
+ValueDefault=false
+
+[Sp Before Sparen]
+Category=1
+Description="<html>Add or remove space before '(' of control statements ('if', 'for', 'switch',<br/>'while', etc.).</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_sparen=ignore|sp_before_sparen=add|sp_before_sparen=remove|sp_before_sparen=force|sp_before_sparen=not_defined
+ChoicesReadable="Ignore Sp Before Sparen|Add Sp Before Sparen|Remove Sp Before Sparen|Force Sp Before Sparen"
+ValueDefault=ignore
+
+[Sp Inside Sparen]
+Category=1
+Description="<html>Add or remove space inside '(' and ')' of control statements.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_sparen=ignore|sp_inside_sparen=add|sp_inside_sparen=remove|sp_inside_sparen=force|sp_inside_sparen=not_defined
+ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen"
+ValueDefault=ignore
+
+[Sp Inside Sparen Open]
+Category=1
+Description="<html>Add or remove space after '(' of control statements.<br/><br/>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|sp_inside_sparen_open=not_defined
+ChoicesReadable="Ignore Sp Inside Sparen Open|Add Sp Inside Sparen Open|Remove Sp Inside Sparen Open|Force Sp Inside Sparen Open"
+ValueDefault=ignore
+
+[Sp Inside Sparen Close]
+Category=1
+Description="<html>Add or remove space before ')' of control statements.<br/><br/>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|sp_inside_sparen_close=not_defined
+ChoicesReadable="Ignore Sp Inside Sparen Close|Add Sp Inside Sparen Close|Remove Sp Inside Sparen Close|Force Sp Inside Sparen Close"
+ValueDefault=ignore
+
+[Sp After Sparen]
+Category=1
+Description="<html>Add or remove space after ')' of control statements.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_sparen=ignore|sp_after_sparen=add|sp_after_sparen=remove|sp_after_sparen=force|sp_after_sparen=not_defined
+ChoicesReadable="Ignore Sp After Sparen|Add Sp After Sparen|Remove Sp After Sparen|Force Sp After Sparen"
+ValueDefault=ignore
+
+[Sp Sparen Brace]
+Category=1
+Description="<html>Add or remove space between ')' and '{' of of control statements.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_sparen_brace=ignore|sp_sparen_brace=add|sp_sparen_brace=remove|sp_sparen_brace=force|sp_sparen_brace=not_defined
+ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace"
+ValueDefault=ignore
+
+[Sp Do Brace Open]
+Category=1
+Description="<html>Add or remove space between 'do' and '{'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_do_brace_open=ignore|sp_do_brace_open=add|sp_do_brace_open=remove|sp_do_brace_open=force|sp_do_brace_open=not_defined
+ChoicesReadable="Ignore Sp Do Brace Open|Add Sp Do Brace Open|Remove Sp Do Brace Open|Force Sp Do Brace Open"
+ValueDefault=ignore
+
+[Sp Brace Close While]
+Category=1
+Description="<html>Add or remove space between '}' and 'while'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_brace_close_while=ignore|sp_brace_close_while=add|sp_brace_close_while=remove|sp_brace_close_while=force|sp_brace_close_while=not_defined
+ChoicesReadable="Ignore Sp Brace Close While|Add Sp Brace Close While|Remove Sp Brace Close While|Force Sp Brace Close While"
+ValueDefault=ignore
+
+[Sp While Paren Open]
+Category=1
+Description="<html>Add or remove space between 'while' and '('. Overrides sp_before_sparen.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_while_paren_open=ignore|sp_while_paren_open=add|sp_while_paren_open=remove|sp_while_paren_open=force|sp_while_paren_open=not_defined
+ChoicesReadable="Ignore Sp While Paren Open|Add Sp While Paren Open|Remove Sp While Paren Open|Force Sp While Paren Open"
+ValueDefault=ignore
+
+[Sp Invariant Paren]
+Category=1
+Description="<html>(D) Add or remove space between 'invariant' and '('.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_invariant_paren=ignore|sp_invariant_paren=add|sp_invariant_paren=remove|sp_invariant_paren=force|sp_invariant_paren=not_defined
+ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren"
+ValueDefault=ignore
+
+[Sp After Invariant Paren]
+Category=1
+Description="<html>(D) Add or remove space after the ')' in 'invariant (C) c'.</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|sp_after_invariant_paren=not_defined
+ChoicesReadable="Ignore Sp After Invariant Paren|Add Sp After Invariant Paren|Remove Sp After Invariant Paren|Force Sp After Invariant Paren"
+ValueDefault=ignore
+
+[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|sp_special_semi=not_defined
+ChoicesReadable="Ignore Sp Special Semi|Add Sp Special Semi|Remove Sp Special Semi|Force Sp Special Semi"
+ValueDefault=ignore
+
+[Sp Before Semi]
+Category=1
+Description="<html>Add or remove space before ';'.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_semi=ignore|sp_before_semi=add|sp_before_semi=remove|sp_before_semi=force|sp_before_semi=not_defined
+ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
+ValueDefault=remove
+
+[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|sp_before_semi_for=not_defined
+ChoicesReadable="Ignore Sp Before Semi For|Add Sp Before Semi For|Remove Sp Before Semi For|Force Sp Before Semi For"
+ValueDefault=ignore
+
+[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|sp_before_semi_for_empty=not_defined
+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
+
+[Sp After Semi]
+Category=1
+Description="<html>Add or remove space after ';', except when followed by a comment.<br/><br/>Default: add</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_semi=ignore|sp_after_semi=add|sp_after_semi=remove|sp_after_semi=force|sp_after_semi=not_defined
+ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
+ValueDefault=add
+
+[Sp After Semi For]
+Category=1
+Description="<html>Add or remove space after ';' in non-empty 'for' statements.<br/><br/>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|sp_after_semi_for=not_defined
+ChoicesReadable="Ignore Sp After Semi For|Add Sp After Semi For|Remove Sp After Semi For|Force Sp After Semi For"
+ValueDefault=force
+
+[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>"
+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|sp_after_semi_for_empty=not_defined
+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
+
+[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|sp_before_square=not_defined
+ChoicesReadable="Ignore Sp Before Square|Add Sp Before Square|Remove Sp Before Square|Force Sp Before Square"
+ValueDefault=ignore
+
+[Sp Before Vardef Square]
+Category=1
+Description="<html>Add or remove space before '[' for a variable definition.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_vardef_square=ignore|sp_before_vardef_square=add|sp_before_vardef_square=remove|sp_before_vardef_square=force|sp_before_vardef_square=not_defined
+ChoicesReadable="Ignore Sp Before Vardef Square|Add Sp Before Vardef Square|Remove Sp Before Vardef Square|Force Sp Before Vardef Square"
+ValueDefault=remove
+
+[Sp Before Square Asm Block]
+Category=1
+Description="<html>Add or remove space before '[' for asm block.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_square_asm_block=ignore|sp_before_square_asm_block=add|sp_before_square_asm_block=remove|sp_before_square_asm_block=force|sp_before_square_asm_block=not_defined
+ChoicesReadable="Ignore Sp Before Square Asm Block|Add Sp Before Square Asm Block|Remove Sp Before Square Asm Block|Force Sp Before Square Asm Block"
+ValueDefault=ignore
+
+[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|sp_before_squares=not_defined
+ChoicesReadable="Ignore Sp Before Squares|Add Sp Before Squares|Remove Sp Before Squares|Force Sp Before Squares"
+ValueDefault=ignore
+
+[Sp Cpp Before Struct Binding]
+Category=1
+Description="<html>Add or remove space before C++17 structured bindings.</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|sp_cpp_before_struct_binding=not_defined
+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
+
+[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|sp_inside_square=not_defined
+ChoicesReadable="Ignore Sp Inside Square|Add Sp Inside Square|Remove Sp Inside Square|Force Sp Inside Square"
+ValueDefault=ignore
+
+[Sp Inside Square Empty]
+Category=1
+Description="<html>Add or remove space inside '[]'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_square_empty=ignore|sp_inside_square_empty=add|sp_inside_square_empty=remove|sp_inside_square_empty=force|sp_inside_square_empty=not_defined
+ChoicesReadable="Ignore Sp Inside Square Empty|Add Sp Inside Square Empty|Remove Sp Inside Square Empty|Force Sp Inside Square Empty"
+ValueDefault=ignore
+
+[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>"
+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|sp_inside_square_oc_array=not_defined
+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
+
+[Sp After Comma]
+Category=1
+Description="<html>Add or remove space after ',', i.e. '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|sp_after_comma=not_defined
+ChoicesReadable="Ignore Sp After Comma|Add Sp After Comma|Remove Sp After Comma|Force Sp After Comma"
+ValueDefault=ignore
+
+[Sp Before Comma]
+Category=1
+Description="<html>Add or remove space before ','.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_comma=ignore|sp_before_comma=add|sp_before_comma=remove|sp_before_comma=force|sp_before_comma=not_defined
+ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
+ValueDefault=remove
+
+[Sp After Mdatype Commas]
+Category=1
+Description="<html>(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</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|sp_after_mdatype_commas=not_defined
+ChoicesReadable="Ignore Sp After Mdatype Commas|Add Sp After Mdatype Commas|Remove Sp After Mdatype Commas|Force Sp After Mdatype Commas"
+ValueDefault=ignore
+
+[Sp Before Mdatype Commas]
+Category=1
+Description="<html>(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</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|sp_before_mdatype_commas=not_defined
+ChoicesReadable="Ignore Sp Before Mdatype Commas|Add Sp Before Mdatype Commas|Remove Sp Before Mdatype Commas|Force Sp Before Mdatype Commas"
+ValueDefault=ignore
+
+[Sp Between Mdatype Commas]
+Category=1
+Description="<html>(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</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|sp_between_mdatype_commas=not_defined
+ChoicesReadable="Ignore Sp Between Mdatype Commas|Add Sp Between Mdatype Commas|Remove Sp Between Mdatype Commas|Force Sp Between Mdatype Commas"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_comma=force|sp_paren_comma=not_defined
+ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
+ValueDefault=force
+
+[Sp Before Ellipsis]
+Category=1
+Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force|sp_before_ellipsis=not_defined
+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|sp_type_ellipsis=not_defined
+ChoicesReadable="Ignore Sp Type Ellipsis|Add Sp Type Ellipsis|Remove Sp Type Ellipsis|Force Sp Type Ellipsis"
+ValueDefault=ignore
+
+[Sp Type Question]
+Category=1
+Description="<html>(D) Add or remove space between a type and '?'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force|sp_type_question=not_defined
+ChoicesReadable="Ignore Sp Type Question|Add Sp Type Question|Remove Sp Type Question|Force Sp Type Question"
+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|sp_paren_ellipsis=not_defined
+ChoicesReadable="Ignore Sp Paren Ellipsis|Add Sp Paren Ellipsis|Remove Sp Paren Ellipsis|Force Sp Paren Ellipsis"
+ValueDefault=ignore
+
+[Sp Paren Qualifier]
+Category=1
+Description="<html>Add or remove space between ')' and a qualifier such as 'const'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_paren_qualifier=ignore|sp_paren_qualifier=add|sp_paren_qualifier=remove|sp_paren_qualifier=force|sp_paren_qualifier=not_defined
+ChoicesReadable="Ignore Sp Paren Qualifier|Add Sp Paren Qualifier|Remove Sp Paren Qualifier|Force Sp Paren Qualifier"
+ValueDefault=ignore
+
+[Sp Paren Noexcept]
+Category=1
+Description="<html>Add or remove space between ')' and 'noexcept'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_paren_noexcept=ignore|sp_paren_noexcept=add|sp_paren_noexcept=remove|sp_paren_noexcept=force|sp_paren_noexcept=not_defined
+ChoicesReadable="Ignore Sp Paren Noexcept|Add Sp Paren Noexcept|Remove Sp Paren Noexcept|Force Sp Paren Noexcept"
+ValueDefault=ignore
+
+[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|sp_after_class_colon=not_defined
+ChoicesReadable="Ignore Sp After Class Colon|Add Sp After Class Colon|Remove Sp After Class Colon|Force Sp After Class Colon"
+ValueDefault=ignore
+
+[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|sp_before_class_colon=not_defined
+ChoicesReadable="Ignore Sp Before Class Colon|Add Sp Before Class Colon|Remove Sp Before Class Colon|Force Sp Before Class Colon"
+ValueDefault=ignore
+
+[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|sp_after_constr_colon=not_defined
+ChoicesReadable="Ignore Sp After Constr Colon|Add Sp After Constr Colon|Remove Sp After Constr Colon|Force Sp After Constr Colon"
+ValueDefault=ignore
+
+[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|sp_before_constr_colon=not_defined
+ChoicesReadable="Ignore Sp Before Constr Colon|Add Sp Before Constr Colon|Remove Sp Before Constr Colon|Force Sp Before Constr Colon"
+ValueDefault=ignore
+
+[Sp Before Case Colon]
+Category=1
+Description="<html>Add or remove space before case ':'.<br/><br/>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|sp_before_case_colon=not_defined
+ChoicesReadable="Ignore Sp Before Case Colon|Add Sp Before Case Colon|Remove Sp Before Case Colon|Force Sp Before Case Colon"
+ValueDefault=remove
+
+[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|sp_after_operator=not_defined
+ChoicesReadable="Ignore Sp After Operator|Add Sp After Operator|Remove Sp After Operator|Force Sp After Operator"
+ValueDefault=ignore
+
+[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>"
+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|sp_after_operator_sym=not_defined
+ChoicesReadable="Ignore Sp After Operator Sym|Add Sp After Operator Sym|Remove Sp After Operator Sym|Force Sp After Operator Sym"
+ValueDefault=ignore
+
+[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>"
+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|sp_after_operator_sym_empty=not_defined
+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
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force|sp_after_cast=not_defined
+ChoicesReadable="Ignore Sp After Cast|Add Sp After Cast|Remove Sp After Cast|Force Sp After Cast"
+ValueDefault=ignore
+
+[Sp Inside Paren Cast]
+Category=1
+Description="<html>Add or remove spaces inside cast parentheses.</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|sp_inside_paren_cast=not_defined
+ChoicesReadable="Ignore Sp Inside Paren Cast|Add Sp Inside Paren Cast|Remove Sp Inside Paren Cast|Force Sp Inside Paren Cast"
+ValueDefault=ignore
+
+[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>"
+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|sp_cpp_cast_paren=not_defined
+ChoicesReadable="Ignore Sp Cpp Cast Paren|Add Sp Cpp Cast Paren|Remove Sp Cpp Cast Paren|Force Sp Cpp Cast Paren"
+ValueDefault=ignore
+
+[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|sp_sizeof_paren=not_defined
+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|sp_sizeof_ellipsis=not_defined
+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|sp_sizeof_ellipsis_paren=not_defined
+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|sp_decltype_paren=not_defined
+ChoicesReadable="Ignore Sp Decltype Paren|Add Sp Decltype Paren|Remove Sp Decltype Paren|Force Sp Decltype Paren"
+ValueDefault=ignore
+
+[Sp After Tag]
+Category=1
+Description="<html>(Pawn) Add or remove space after the tag keyword.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_tag=ignore|sp_after_tag=add|sp_after_tag=remove|sp_after_tag=force|sp_after_tag=not_defined
+ChoicesReadable="Ignore Sp After Tag|Add Sp After Tag|Remove Sp After Tag|Force Sp After Tag"
+ValueDefault=ignore
+
+[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|sp_inside_braces_enum=not_defined
+ChoicesReadable="Ignore Sp Inside Braces Enum|Add Sp Inside Braces Enum|Remove Sp Inside Braces Enum|Force Sp Inside Braces Enum"
+ValueDefault=ignore
+
+[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|sp_inside_braces_struct=not_defined
+ChoicesReadable="Ignore Sp Inside Braces Struct|Add Sp Inside Braces Struct|Remove Sp Inside Braces Struct|Force Sp Inside Braces Struct"
+ValueDefault=ignore
+
+[Sp Inside Braces Oc Dict]
+Category=1
+Description="<html>(OC) Add or remove space inside Objective-C 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|sp_inside_braces_oc_dict=not_defined
+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
+
+[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>"
+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|sp_after_type_brace_init_lst_open=not_defined
+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
+
+[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>"
+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|sp_before_type_brace_init_lst_close=not_defined
+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
+
+[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|sp_inside_type_brace_init_lst=not_defined
+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
+
+[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|sp_inside_braces=not_defined
+ChoicesReadable="Ignore Sp Inside Braces|Add Sp Inside Braces|Remove Sp Inside Braces|Force Sp Inside Braces"
+ValueDefault=ignore
+
+[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|sp_inside_braces_empty=not_defined
+ChoicesReadable="Ignore Sp Inside Braces Empty|Add Sp Inside Braces Empty|Remove Sp Inside Braces Empty|Force Sp Inside Braces Empty"
+ValueDefault=ignore
+
+[Sp Trailing Return]
+Category=1
+Description="<html>Add or remove space around trailing return operator '-&gt;'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_trailing_return=ignore|sp_trailing_return=add|sp_trailing_return=remove|sp_trailing_return=force|sp_trailing_return=not_defined
+ChoicesReadable="Ignore Sp Trailing Return|Add Sp Trailing Return|Remove Sp Trailing Return|Force Sp Trailing Return"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force|sp_type_func=not_defined
+ChoicesReadable="Ignore Sp Type Func|Add Sp Type Func|Remove Sp Type Func|Force Sp Type Func"
+ValueDefault=ignore
+
+[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>"
+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|sp_type_brace_init_lst=not_defined
+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
+
+[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|sp_func_proto_paren=not_defined
+ChoicesReadable="Ignore Sp Func Proto Paren|Add Sp Func Proto Paren|Remove Sp Func Proto Paren|Force Sp Func Proto Paren"
+ValueDefault=ignore
+
+[Sp Func Proto Paren Empty]
+Category=1
+Description="<html>Add or remove space between function name and '()' on function declaration<br/>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|sp_func_proto_paren_empty=not_defined
+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
+
+[Sp Func Type Paren]
+Category=1
+Description="<html>Add or remove space between function name and '(' with a typedef specifier.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_func_type_paren=ignore|sp_func_type_paren=add|sp_func_type_paren=remove|sp_func_type_paren=force|sp_func_type_paren=not_defined
+ChoicesReadable="Ignore Sp Func Type Paren|Add Sp Func Type Paren|Remove Sp Func Type Paren|Force Sp Func Type Paren"
+ValueDefault=ignore
+
+[Sp Func Def Paren]
+Category=1
+Description="<html>Add or remove space between alias name and '(' of a non-pointer function type typedef.</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|sp_func_def_paren=not_defined
+ChoicesReadable="Ignore Sp Func Def Paren|Add Sp Func Def Paren|Remove Sp Func Def Paren|Force Sp Func Def Paren"
+ValueDefault=ignore
+
+[Sp Func Def Paren Empty]
+Category=1
+Description="<html>Add or remove space between function name and '()' on function definition<br/>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|sp_func_def_paren_empty=not_defined
+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
+
+[Sp Inside Fparens]
+Category=1
+Description="<html>Add or remove space inside empty function '()'.<br/>Overrides sp_after_angle unless use_sp_after_angle_always is set to true.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_fparens=ignore|sp_inside_fparens=add|sp_inside_fparens=remove|sp_inside_fparens=force|sp_inside_fparens=not_defined
+ChoicesReadable="Ignore Sp Inside Fparens|Add Sp Inside Fparens|Remove Sp Inside Fparens|Force Sp Inside Fparens"
+ValueDefault=ignore
+
+[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|sp_inside_fparen=not_defined
+ChoicesReadable="Ignore Sp Inside Fparen|Add Sp Inside Fparen|Remove Sp Inside Fparen|Force Sp Inside Fparen"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_tparen=ignore|sp_inside_tparen=add|sp_inside_tparen=remove|sp_inside_tparen=force|sp_inside_tparen=not_defined
+ChoicesReadable="Ignore Sp Inside Tparen|Add Sp Inside Tparen|Remove Sp Inside Tparen|Force Sp Inside Tparen"
+ValueDefault=ignore
+
+[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>"
+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|sp_after_tparen_close=not_defined
+ChoicesReadable="Ignore Sp After Tparen Close|Add Sp After Tparen Close|Remove Sp After Tparen Close|Force Sp After Tparen Close"
+ValueDefault=ignore
+
+[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|sp_square_fparen=not_defined
+ChoicesReadable="Ignore Sp Square Fparen|Add Sp Square Fparen|Remove Sp Square Fparen|Force Sp Square Fparen"
+ValueDefault=ignore
+
+[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|sp_fparen_brace=not_defined
+ChoicesReadable="Ignore Sp Fparen Brace|Add Sp Fparen Brace|Remove Sp Fparen Brace|Force Sp Fparen Brace"
+ValueDefault=ignore
+
+[Sp Fparen Brace Initializer]
+Category=1
+Description="<html>Add or remove space between ')' and '{' of a function call in object<br/>initialization.<br/><br/>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|sp_fparen_brace_initializer=not_defined
+ChoicesReadable="Ignore Sp Fparen Brace Initializer|Add Sp Fparen Brace Initializer|Remove Sp Fparen Brace Initializer|Force Sp Fparen Brace Initializer"
+ValueDefault=ignore
+
+[Sp Fparen Dbrace]
+Category=1
+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|sp_fparen_dbrace=not_defined
+ChoicesReadable="Ignore Sp Fparen Dbrace|Add Sp Fparen Dbrace|Remove Sp Fparen Dbrace|Force Sp Fparen Dbrace"
+ValueDefault=ignore
+
+[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|sp_func_call_paren=not_defined
+ChoicesReadable="Ignore Sp Func Call Paren|Add Sp Func Call Paren|Remove Sp Func Call Paren|Force Sp Func Call Paren"
+ValueDefault=ignore
+
+[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>"
+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|sp_func_call_paren_empty=not_defined
+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
+
+[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>"
+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|sp_func_call_user_paren=not_defined
+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
+
+[Sp Func Call User Inside Fparen]
+Category=1
+Description="<html>Add or remove space inside user function '(' and ')'.</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|sp_func_call_user_inside_fparen=not_defined
+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
+
+[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>"
+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|sp_func_call_user_paren_paren=not_defined
+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
+
+[Sp Func Class Paren]
+Category=1
+Description="<html>Add or remove space between a constructor/destructor and the open<br/>parenthesis.</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|sp_func_class_paren=not_defined
+ChoicesReadable="Ignore Sp Func Class Paren|Add Sp Func Class Paren|Remove Sp Func Class Paren|Force Sp Func Class Paren"
+ValueDefault=ignore
+
+[Sp Func Class Paren Empty]
+Category=1
+Description="<html>Add or remove space between a constructor without parameters or destructor<br/>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|sp_func_class_paren_empty=not_defined
+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
+
+[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|sp_return_paren=not_defined
+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|sp_return_brace=not_defined
+ChoicesReadable="Ignore Sp Return Brace|Add Sp Return Brace|Remove Sp Return Brace|Force Sp Return Brace"
+ValueDefault=ignore
+
+[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|sp_attribute_paren=not_defined
+ChoicesReadable="Ignore Sp Attribute Paren|Add Sp Attribute Paren|Remove Sp Attribute Paren|Force Sp Attribute Paren"
+ValueDefault=ignore
+
+[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|sp_defined_paren=not_defined
+ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren"
+ValueDefault=ignore
+
+[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|sp_throw_paren=not_defined
+ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
+ValueDefault=ignore
+
+[Sp After Throw]
+Category=1
+Description="<html>Add or remove space between 'throw' and anything other than '(' as in<br/>'@throw [...];'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_throw=ignore|sp_after_throw=add|sp_after_throw=remove|sp_after_throw=force|sp_after_throw=not_defined
+ChoicesReadable="Ignore Sp After Throw|Add Sp After Throw|Remove Sp After Throw|Force Sp After Throw"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_catch_paren=ignore|sp_catch_paren=add|sp_catch_paren=remove|sp_catch_paren=force|sp_catch_paren=not_defined
+ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
+ValueDefault=ignore
+
+[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>"
+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|sp_oc_catch_paren=not_defined
+ChoicesReadable="Ignore Sp Oc Catch Paren|Add Sp Oc Catch Paren|Remove Sp Oc Catch Paren|Force Sp Oc Catch Paren"
+ValueDefault=ignore
+
+[Sp Before Oc Proto List]
+Category=1
+Description="<html>(OC) Add or remove space before Objective-C protocol list<br/>as in '@protocol Protocol&lt;here&gt;&lt;Protocol_A&gt;' or '@interface MyClass : NSObject&lt;here&gt;&lt;MyProtocol&gt;'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_oc_proto_list=ignore|sp_before_oc_proto_list=add|sp_before_oc_proto_list=remove|sp_before_oc_proto_list=force|sp_before_oc_proto_list=not_defined
+ChoicesReadable="Ignore Sp Before Oc Proto List|Add Sp Before Oc Proto List|Remove Sp Before Oc Proto List|Force Sp Before Oc Proto List"
+ValueDefault=ignore
+
+[Sp Oc Classname Paren]
+Category=1
+Description="<html>(OC) Add or remove space between class name and '('<br/>in '@interface className(categoryName)&lt;ProtocolName&gt;:BaseClass'</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_oc_classname_paren=ignore|sp_oc_classname_paren=add|sp_oc_classname_paren=remove|sp_oc_classname_paren=force|sp_oc_classname_paren=not_defined
+ChoicesReadable="Ignore Sp Oc Classname Paren|Add Sp Oc Classname Paren|Remove Sp Oc Classname Paren|Force Sp Oc Classname Paren"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_version_paren=ignore|sp_version_paren=add|sp_version_paren=remove|sp_version_paren=force|sp_version_paren=not_defined
+ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_scope_paren=ignore|sp_scope_paren=add|sp_scope_paren=remove|sp_scope_paren=force|sp_scope_paren=not_defined
+ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
+ValueDefault=ignore
+
+[Sp Super Paren]
+Category=1
+Description="<html>Add or remove space between 'super' and '(' in 'super (something)'.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_super_paren=ignore|sp_super_paren=add|sp_super_paren=remove|sp_super_paren=force|sp_super_paren=not_defined
+ChoicesReadable="Ignore Sp Super Paren|Add Sp Super Paren|Remove Sp Super Paren|Force Sp Super Paren"
+ValueDefault=remove
+
+[Sp This Paren]
+Category=1
+Description="<html>Add or remove space between 'this' and '(' in 'this (something)'.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_this_paren=ignore|sp_this_paren=add|sp_this_paren=remove|sp_this_paren=force|sp_this_paren=not_defined
+ChoicesReadable="Ignore Sp This Paren|Add Sp This Paren|Remove Sp This Paren|Force Sp This Paren"
+ValueDefault=remove
+
+[Sp Macro]
+Category=1
+Description="<html>Add or remove space between a macro name and its definition.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_macro=ignore|sp_macro=add|sp_macro=remove|sp_macro=force|sp_macro=not_defined
+ChoicesReadable="Ignore Sp Macro|Add Sp Macro|Remove Sp Macro|Force Sp Macro"
+ValueDefault=ignore
+
+[Sp Macro Func]
+Category=1
+Description="<html>Add or remove space between a macro function ')' and its definition.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_macro_func=ignore|sp_macro_func=add|sp_macro_func=remove|sp_macro_func=force|sp_macro_func=not_defined
+ChoicesReadable="Ignore Sp Macro Func|Add Sp Macro Func|Remove Sp Macro Func|Force Sp Macro Func"
+ValueDefault=ignore
+
+[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|sp_else_brace=not_defined
+ChoicesReadable="Ignore Sp Else Brace|Add Sp Else Brace|Remove Sp Else Brace|Force Sp Else Brace"
+ValueDefault=ignore
+
+[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|sp_brace_else=not_defined
+ChoicesReadable="Ignore Sp Brace Else|Add Sp Brace Else|Remove Sp Brace Else|Force Sp Brace Else"
+ValueDefault=ignore
+
+[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|sp_brace_typedef=not_defined
+ChoicesReadable="Ignore Sp Brace Typedef|Add Sp Brace Typedef|Remove Sp Brace Typedef|Force Sp Brace Typedef"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force|sp_catch_brace=not_defined
+ChoicesReadable="Ignore Sp Catch Brace|Add Sp Catch Brace|Remove Sp Catch Brace|Force Sp Catch Brace"
+ValueDefault=ignore
+
+[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>"
+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|sp_oc_catch_brace=not_defined
+ChoicesReadable="Ignore Sp Oc Catch Brace|Add Sp Oc Catch Brace|Remove Sp Oc Catch Brace|Force Sp Oc Catch Brace"
+ValueDefault=ignore
+
+[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|sp_brace_catch=not_defined
+ChoicesReadable="Ignore Sp Brace Catch|Add Sp Brace Catch|Remove Sp Brace Catch|Force Sp Brace Catch"
+ValueDefault=ignore
+
+[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>"
+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|sp_oc_brace_catch=not_defined
+ChoicesReadable="Ignore Sp Oc Brace Catch|Add Sp Oc Brace Catch|Remove Sp Oc Brace Catch|Force Sp Oc Brace Catch"
+ValueDefault=ignore
+
+[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|sp_finally_brace=not_defined
+ChoicesReadable="Ignore Sp Finally Brace|Add Sp Finally Brace|Remove Sp Finally Brace|Force Sp Finally Brace"
+ValueDefault=ignore
+
+[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|sp_brace_finally=not_defined
+ChoicesReadable="Ignore Sp Brace Finally|Add Sp Brace Finally|Remove Sp Brace Finally|Force Sp Brace Finally"
+ValueDefault=ignore
+
+[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|sp_try_brace=not_defined
+ChoicesReadable="Ignore Sp Try Brace|Add Sp Try Brace|Remove Sp Try Brace|Force Sp Try Brace"
+ValueDefault=ignore
+
+[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|sp_getset_brace=not_defined
+ChoicesReadable="Ignore Sp Getset Brace|Add Sp Getset Brace|Remove Sp Getset Brace|Force Sp Getset Brace"
+ValueDefault=ignore
+
+[Sp Word Brace Init Lst]
+Category=1
+Description="<html>Add or remove space between a variable and '{' for C++ uniform<br/>initialization.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_word_brace_init_lst=ignore|sp_word_brace_init_lst=add|sp_word_brace_init_lst=remove|sp_word_brace_init_lst=force|sp_word_brace_init_lst=not_defined
+ChoicesReadable="Ignore Sp Word Brace Init Lst|Add Sp Word Brace Init Lst|Remove Sp Word Brace Init Lst|Force Sp Word Brace Init Lst"
+ValueDefault=ignore
+
+[Sp Word Brace Ns]
+Category=1
+Description="<html>Add or remove space between a variable and '{' for a namespace.<br/><br/>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|sp_word_brace_ns=not_defined
+ChoicesReadable="Ignore Sp Word Brace Ns|Add Sp Word Brace Ns|Remove Sp Word Brace Ns|Force Sp Word Brace Ns"
+ValueDefault=add
+
+[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|sp_before_dc=not_defined
+ChoicesReadable="Ignore Sp Before Dc|Add Sp Before Dc|Remove Sp Before Dc|Force Sp Before Dc"
+ValueDefault=ignore
+
+[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|sp_after_dc=not_defined
+ChoicesReadable="Ignore Sp After Dc|Add Sp After Dc|Remove Sp After Dc|Force Sp After Dc"
+ValueDefault=ignore
+
+[Sp D Array Colon]
+Category=1
+Description="<html>(D) 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|sp_d_array_colon=not_defined
+ChoicesReadable="Ignore Sp D Array Colon|Add Sp D Array Colon|Remove Sp D Array Colon|Force Sp D Array Colon"
+ValueDefault=ignore
+
+[Sp Not]
+Category=1
+Description="<html>Add or remove space after the '!' (not) unary operator.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force|sp_not=not_defined
+ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
+ValueDefault=remove
+
+[Sp Inv]
+Category=1
+Description="<html>Add or remove space after the '~' (invert) unary operator.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inv=ignore|sp_inv=add|sp_inv=remove|sp_inv=force|sp_inv=not_defined
+ChoicesReadable="Ignore Sp Inv|Add Sp Inv|Remove Sp Inv|Force Sp Inv"
+ValueDefault=remove
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force|sp_addr=not_defined
+ChoicesReadable="Ignore Sp Addr|Add Sp Addr|Remove Sp Addr|Force Sp Addr"
+ValueDefault=remove
+
+[Sp Member]
+Category=1
+Description="<html>Add or remove space around the '.' or '-&gt;' operators.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_member=ignore|sp_member=add|sp_member=remove|sp_member=force|sp_member=not_defined
+ChoicesReadable="Ignore Sp Member|Add Sp Member|Remove Sp Member|Force Sp Member"
+ValueDefault=remove
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force|sp_deref=not_defined
+ChoicesReadable="Ignore Sp Deref|Add Sp Deref|Remove Sp Deref|Force Sp Deref"
+ValueDefault=remove
+
+[Sp Sign]
+Category=1
+Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.<br/><br/>Default: remove</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_sign=ignore|sp_sign=add|sp_sign=remove|sp_sign=force|sp_sign=not_defined
+ChoicesReadable="Ignore Sp Sign|Add Sp Sign|Remove Sp Sign|Force Sp Sign"
+ValueDefault=remove
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force|sp_incdec=not_defined
+ChoicesReadable="Ignore Sp Incdec|Add Sp Incdec|Remove Sp Incdec|Force Sp Incdec"
+ValueDefault=remove
+
+[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>"
+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|sp_before_nl_cont=not_defined
+ChoicesReadable="Ignore Sp Before Nl Cont|Add Sp Before Nl Cont|Remove Sp Before Nl Cont|Force Sp Before Nl Cont"
+ValueDefault=add
+
+[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>"
+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|sp_after_oc_scope=not_defined
+ChoicesReadable="Ignore Sp After Oc Scope|Add Sp After Oc Scope|Remove Sp After Oc Scope|Force Sp After Oc Scope"
+ValueDefault=ignore
+
+[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>"
+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|sp_after_oc_colon=not_defined
+ChoicesReadable="Ignore Sp After Oc Colon|Add Sp After Oc Colon|Remove Sp After Oc Colon|Force Sp After Oc Colon"
+ValueDefault=ignore
+
+[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>"
+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|sp_before_oc_colon=not_defined
+ChoicesReadable="Ignore Sp Before Oc Colon|Add Sp Before Oc Colon|Remove Sp Before Oc Colon|Force Sp Before Oc Colon"
+ValueDefault=ignore
+
+[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>"
+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|sp_after_oc_dict_colon=not_defined
+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
+
+[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>"
+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|sp_before_oc_dict_colon=not_defined
+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
+
+[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>"
+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|sp_after_send_oc_colon=not_defined
+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
+
+[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>"
+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|sp_before_send_oc_colon=not_defined
+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
+
+[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>"
+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|sp_after_oc_type=not_defined
+ChoicesReadable="Ignore Sp After Oc Type|Add Sp After Oc Type|Remove Sp After Oc Type|Force Sp After Oc Type"
+ValueDefault=ignore
+
+[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>"
+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|sp_after_oc_return_type=not_defined
+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
+
+[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>"
+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|sp_after_oc_at_sel=not_defined
+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
+
+[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>"
+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|sp_after_oc_at_sel_parens=not_defined
+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
+
+[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>"
+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|sp_inside_oc_at_sel_parens=not_defined
+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
+
+[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>"
+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|sp_before_oc_block_caret=not_defined
+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
+
+[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>"
+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|sp_after_oc_block_caret=not_defined
+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
+
+[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>"
+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|sp_after_oc_msg_receiver=not_defined
+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
+
+[Sp After Oc Property]
+Category=1
+Description="<html>(OC) 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|sp_after_oc_property=not_defined
+ChoicesReadable="Ignore Sp After Oc Property|Add Sp After Oc Property|Remove Sp After Oc Property|Force Sp After Oc Property"
+ValueDefault=ignore
+
+[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>"
+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|sp_after_oc_synchronized=not_defined
+ChoicesReadable="Ignore Sp After Oc Synchronized|Add Sp After Oc Synchronized|Remove Sp After Oc Synchronized|Force Sp After Oc Synchronized"
+ValueDefault=ignore
+
+[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|sp_cond_colon=not_defined
+ChoicesReadable="Ignore Sp Cond Colon|Add Sp Cond Colon|Remove Sp Cond Colon|Force Sp Cond Colon"
+ValueDefault=ignore
+
+[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>"
+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|sp_cond_colon_before=not_defined
+ChoicesReadable="Ignore Sp Cond Colon Before|Add Sp Cond Colon Before|Remove Sp Cond Colon Before|Force Sp Cond Colon Before"
+ValueDefault=ignore
+
+[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>"
+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|sp_cond_colon_after=not_defined
+ChoicesReadable="Ignore Sp Cond Colon After|Add Sp Cond Colon After|Remove Sp Cond Colon After|Force Sp Cond Colon After"
+ValueDefault=ignore
+
+[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|sp_cond_question=not_defined
+ChoicesReadable="Ignore Sp Cond Question|Add Sp Cond Question|Remove Sp Cond Question|Force Sp Cond Question"
+ValueDefault=ignore
+
+[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>"
+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|sp_cond_question_before=not_defined
+ChoicesReadable="Ignore Sp Cond Question Before|Add Sp Cond Question Before|Remove Sp Cond Question Before|Force Sp Cond Question Before"
+ValueDefault=ignore
+
+[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>"
+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|sp_cond_question_after=not_defined
+ChoicesReadable="Ignore Sp Cond Question After|Add Sp Cond Question After|Remove Sp Cond Question After|Force Sp Cond Question After"
+ValueDefault=ignore
+
+[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>"
+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|sp_cond_ternary_short=not_defined
+ChoicesReadable="Ignore Sp Cond Ternary Short|Add Sp Cond Ternary Short|Remove Sp Cond Ternary Short|Force Sp Cond Ternary Short"
+ValueDefault=ignore
+
+[Sp Case Label]
+Category=1
+Description="<html>Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make<br/>sense here.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_case_label=ignore|sp_case_label=add|sp_case_label=remove|sp_case_label=force|sp_case_label=not_defined
+ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label"
+ValueDefault=ignore
+
+[Sp Range]
+Category=1
+Description="<html>(D) Add or remove space around the D '..' operator.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_range=ignore|sp_range=add|sp_range=remove|sp_range=force|sp_range=not_defined
+ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range"
+ValueDefault=ignore
+
+[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 : &lt;here&gt; expr)'.</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|sp_after_for_colon=not_defined
+ChoicesReadable="Ignore Sp After For Colon|Add Sp After For Colon|Remove Sp After For Colon|Force Sp After For Colon"
+ValueDefault=ignore
+
+[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 &lt;here&gt; : expr)'.</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|sp_before_for_colon=not_defined
+ChoicesReadable="Ignore Sp Before For Colon|Add Sp Before For Colon|Remove Sp Before For Colon|Force Sp Before For Colon"
+ValueDefault=ignore
+
+[Sp Extern Paren]
+Category=1
+Description="<html>(D) Add or remove space between 'extern' and '(' as in 'extern &lt;here&gt; (C)'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_extern_paren=ignore|sp_extern_paren=add|sp_extern_paren=remove|sp_extern_paren=force|sp_extern_paren=not_defined
+ChoicesReadable="Ignore Sp Extern Paren|Add Sp Extern Paren|Remove Sp Extern Paren|Force Sp Extern Paren"
+ValueDefault=ignore
+
+[Sp Cmt Cpp Start]
+Category=1
+Description="<html>Add or remove space after the opening of a C++ comment, as in '// &lt;here&gt; 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|sp_cmt_cpp_start=not_defined
+ChoicesReadable="Ignore Sp Cmt Cpp Start|Add Sp Cmt Cpp Start|Remove Sp Cmt Cpp Start|Force Sp Cmt Cpp Start"
+ValueDefault=ignore
+
+[Sp Cmt Cpp Region]
+Category=1
+Description="<html>Add or remove space in a C++ region marker comment, as in '// &lt;here&gt; BEGIN'.<br/>A region marker is defined as a comment which is not preceded by other text<br/>(i.e. the comment is the first non-whitespace on the line), and which starts<br/>with either 'BEGIN' or 'END'.<br/><br/>Overrides sp_cmt_cpp_start.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cmt_cpp_region=ignore|sp_cmt_cpp_region=add|sp_cmt_cpp_region=remove|sp_cmt_cpp_region=force|sp_cmt_cpp_region=not_defined
+ChoicesReadable="Ignore Sp Cmt Cpp Region|Add Sp Cmt Cpp Region|Remove Sp Cmt Cpp Region|Force Sp Cmt Cpp Region"
+ValueDefault=ignore
+
+[Sp Cmt Cpp Doxygen]
+Category=1
+Description="<html>If true, space added with sp_cmt_cpp_start will be added after Doxygen<br/>sequences like '///', '///&lt;', '//!' and '//!&lt;'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_cmt_cpp_doxygen=true|sp_cmt_cpp_doxygen=false
+ValueDefault=false
+
+[Sp Cmt Cpp Qttr]
+Category=1
+Description="<html>If true, space added with sp_cmt_cpp_start will be added after Qt translator<br/>or meta-data comments like '//:', '//=', and '//~'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_cmt_cpp_qttr=true|sp_cmt_cpp_qttr=false
+ValueDefault=false
+
+[Sp Endif Cmt]
+Category=1
+Description="<html>Add or remove space 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|sp_endif_cmt=not_defined
+ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
+ValueDefault=ignore
+
+[Sp After New]
+Category=1
+Description="<html>Add or remove space 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|sp_after_new=not_defined
+ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
+ValueDefault=ignore
+
+[Sp Between New Paren]
+Category=1
+Description="<html>Add or remove space 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|sp_between_new_paren=not_defined
+ChoicesReadable="Ignore Sp Between New Paren|Add Sp Between New Paren|Remove Sp Between New Paren|Force Sp Between New Paren"
+ValueDefault=ignore
+
+[Sp After Newop Paren]
+Category=1
+Description="<html>Add or remove space 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|sp_after_newop_paren=not_defined
+ChoicesReadable="Ignore Sp After Newop Paren|Add Sp After Newop Paren|Remove Sp After Newop Paren|Force Sp After Newop Paren"
+ValueDefault=ignore
+
+[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>"
+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|sp_inside_newop_paren=not_defined
+ChoicesReadable="Ignore Sp Inside Newop Paren|Add Sp Inside Newop Paren|Remove Sp Inside Newop Paren|Force Sp Inside Newop Paren"
+ValueDefault=ignore
+
+[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>"
+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|sp_inside_newop_paren_open=not_defined
+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
+
+[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>"
+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|sp_inside_newop_paren_close=not_defined
+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
+
+[Sp Before Tr Emb Cmt]
+Category=1
+Description="<html>Add or remove space 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|sp_before_tr_emb_cmt=not_defined
+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
+
+[Sp Num Before Tr Emb Cmt]
+Category=1
+Description="<html>Number of spaces before a trailing or embedded comment.</html>"
+Enabled=false
+EditorType=numeric
+CallName="sp_num_before_tr_emb_cmt="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Sp Annotation Paren]
+Category=1
+Description="<html>(Java) Add or remove space between an annotation and the open parenthesis.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_annotation_paren=ignore|sp_annotation_paren=add|sp_annotation_paren=remove|sp_annotation_paren=force|sp_annotation_paren=not_defined
+ChoicesReadable="Ignore Sp Annotation Paren|Add Sp Annotation Paren|Remove Sp Annotation Paren|Force Sp Annotation Paren"
+ValueDefault=ignore
+
+[Sp Skip Vbrace Tokens]
+Category=1
+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
+
+[Sp After Noexcept]
+Category=1
+Description="<html>Add or remove 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|sp_after_noexcept=not_defined
+ChoicesReadable="Ignore Sp After Noexcept|Add Sp After Noexcept|Remove Sp After Noexcept|Force Sp After Noexcept"
+ValueDefault=ignore
+
+[Sp Vala After Translation]
+Category=1
+Description="<html>Add or remove space after '_'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_vala_after_translation=ignore|sp_vala_after_translation=add|sp_vala_after_translation=remove|sp_vala_after_translation=force|sp_vala_after_translation=not_defined
+ChoicesReadable="Ignore Sp Vala After Translation|Add Sp Vala After Translation|Remove Sp Vala After Translation|Force Sp Vala After Translation"
+ValueDefault=ignore
+
+[Force Tab After Define]
+Category=1
+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
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_columns="
+MinVal=0
+MaxVal=16
+ValueDefault=8
+
+[Indent Continue]
+Category=2
+Description="<html>The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.</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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_single_newlines=true|indent_single_newlines=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_param="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=true
+EditorType=multiple
+Choices="indent_with_tabs=0|indent_with_tabs=1|indent_with_tabs=2"
+ChoicesReadable="Spaces only|Indent with tabs, align with spaces|Indent and align with tabs"
+ValueDefault=1
+
+[Indent Cmt With Tabs]
+Category=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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_cmt_with_tabs=true|indent_cmt_with_tabs=false
+ValueDefault=false
+
+[Indent Align String]
+Category=2
+Description="<html>Whether to indent strings broken by '\' so that they line up.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_align_string=true|indent_align_string=false
+ValueDefault=false
+
+[Indent Xml String]
+Category=2
+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="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Indent Brace]
+Category=2
+Description="<html>Spaces to indent '{' from level.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_brace="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Indent Braces]
+Category=2
+Description="<html>Whether braces are indented to the body level.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_braces=true|indent_braces=false
+ValueDefault=false
+
+[Indent Braces No Func]
+Category=2
+Description="<html>Whether to disable indenting function braces if indent_braces=true.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_braces_no_func=true|indent_braces_no_func=false
+ValueDefault=false
+
+[Indent Braces No Class]
+Category=2
+Description="<html>Whether to disable indenting class braces if indent_braces=true.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_braces_no_class=true|indent_braces_no_class=false
+ValueDefault=false
+
+[Indent Braces No Struct]
+Category=2
+Description="<html>Whether to disable indenting struct braces if indent_braces=true.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_braces_no_struct=true|indent_braces_no_struct=false
+ValueDefault=false
+
+[Indent Brace Parent]
+Category=2
+Description="<html>Whether to indent based on the size of the brace parent,<br/>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
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_paren_open_brace=true|indent_paren_open_brace=false
+ValueDefault=false
+
+[Indent Cs Delegate Brace]
+Category=2
+Description="<html>(C#) Whether to indent the brace of a C# delegate by another level.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_cs_delegate_brace=true|indent_cs_delegate_brace=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_cs_delegate_body=true|indent_cs_delegate_body=false
+ValueDefault=false
+
+[Indent Namespace]
+Category=2
+Description="<html>Whether to indent the body of a 'namespace'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_namespace=true|indent_namespace=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_namespace_single_indent=true|indent_namespace_single_indent=false
+ValueDefault=false
+
+[Indent Namespace Level]
+Category=2
+Description="<html>The number of spaces to indent a namespace block.<br/>If set to zero, use the value indent_columns</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_namespace_level="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_namespace_limit="
+MinVal=0
+MaxVal=255
+ValueDefault=0
+
+[Indent Extern]
+Category=2
+Description="<html>Whether the 'extern "C"' body is indented.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_extern=true|indent_extern=false
+ValueDefault=false
+
+[Indent Class]
+Category=2
+Description="<html>Whether the 'class' body is indented.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_class=true|indent_class=false
+ValueDefault=false
+
+[Indent Before Class Colon]
+Category=2
+Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires a newline break before colon (see pos_class_colon<br/>and nl_class_colon)</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_before_class_colon="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
+[Indent Class Colon]
+Category=2
+Description="<html>Whether to indent the stuff after a leading base class colon.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_class_colon=true|indent_class_colon=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false
+ValueDefault=false
+
+[Indent Constr Colon]
+Category=2
+Description="<html>Whether to indent the stuff after a leading class initializer colon.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_constr_colon=true|indent_constr_colon=false
+ValueDefault=false
+
+[Indent Ctor Init Leading]
+Category=2
+Description="<html>Virtual indent from the ':' for member initializers.<br/><br/>Default: 2</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_ctor_init_leading="
+MinVal=0
+MaxVal=16
+ValueDefault=2
+
+[Indent Ctor Init]
+Category=2
+Description="<html>Additional indent for constructor initializer list.<br/>Negative values decrease indent down to the first column.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_ctor_init="
+MinVal=-16
+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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_else_if=true|indent_else_if=false
+ValueDefault=false
+
+[Indent Var Def Blk]
+Category=2
+Description="<html>Amount to indent variable declarations after a open brace.<br/><br/> &lt;0: Relative<br/>&gt;=0: Absolute</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_var_def_blk="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
+[Indent Var Def Cont]
+Category=2
+Description="<html>Whether to 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
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_shift=true|indent_shift=false
+ValueDefault=false
+
+[Indent Func Def Force Col1]
+Category=2
+Description="<html>Whether to force indentation of function definitions to start in column 1.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_func_def_force_col1=true|indent_func_def_force_col1=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_func_call_param=true|indent_func_call_param=false
+ValueDefault=false
+
+[Indent Func Def Param]
+Category=2
+Description="<html>Whether to indent continued function definition parameters one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_func_def_param=true|indent_func_def_param=false
+ValueDefault=false
+
+[Indent Func Def Param Paren Pos Threshold]
+Category=2
+Description="<html>for function definitions, only if indent_func_def_param is false<br/>Allows to align params when appropriate and indent them when not<br/>behave as if it was true if paren position is more than this value<br/>if paren position is more than the option value</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_func_def_param_paren_pos_threshold="
+MinVal=0
+MaxVal=160
+ValueDefault=0
+
+[Indent Func Proto Param]
+Category=2
+Description="<html>Whether to indent continued function call prototype one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_func_proto_param=true|indent_func_proto_param=false
+ValueDefault=false
+
+[Indent Func Class Param]
+Category=2
+Description="<html>Whether to indent continued function call declaration one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_func_class_param=true|indent_func_class_param=false
+ValueDefault=false
+
+[Indent Func Ctor Var Param]
+Category=2
+Description="<html>Whether to indent continued class variable constructors one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_func_ctor_var_param=true|indent_func_ctor_var_param=false
+ValueDefault=false
+
+[Indent Template Param]
+Category=2
+Description="<html>Whether to indent continued template parameter list one indent level,<br/>rather than aligning parameters under the open parenthesis.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_template_param=true|indent_template_param=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_func_param_double=true|indent_func_param_double=false
+ValueDefault=false
+
+[Indent Func Const]
+Category=2
+Description="<html>Indentation column for standalone 'const' qualifier on a function<br/>prototype.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_func_const="
+MinVal=0
+MaxVal=69
+ValueDefault=0
+
+[Indent Func Throw]
+Category=2
+Description="<html>Indentation column for standalone 'throw' qualifier on a function<br/>prototype.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_func_throw="
+MinVal=0
+MaxVal=41
+ValueDefault=0
+
+[Indent Macro Brace]
+Category=2
+Description="<html>How to indent within a macro followed by a brace on the same line<br/>This allows reducing the indent in macros that have (for example)<br/>`do { ... } while (0)` blocks bracketing them.<br/><br/>true:  add an indent for the brace on the same line as the macro<br/>false: do not add an indent for the brace on the same line as the macro<br/><br/>Default: true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_macro_brace=true|indent_macro_brace=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_member="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_member_single=true|indent_member_single=false
+ValueDefault=false
+
+[Indent Sing Line Comments]
+Category=2
+Description="<html>Spaces to indent single line ('//') comments on lines before code.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_sing_line_comments="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Indent Sparen Extra]
+Category=2
+Description="<html>When opening a paren for a control statement (if, for, while, etc), increase<br/>the indent level by this value. Negative values decrease the indent level.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_sparen_extra="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_relative_single_line_comments=true|indent_relative_single_line_comments=false
+ValueDefault=false
+
+[Indent Switch Case]
+Category=2
+Description="<html>Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.<br/>It might wise to choose the same value for the option indent_case_brace.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_switch_case="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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.<br/>It might wise to choose the same value for the option indent_switch_case.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_case_brace="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
+[Indent Switch Break With Case]
+Category=2
+Description="<html>indent 'break' with 'case' from 'switch'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_switch_break_with_case=true|indent_switch_break_with_case=false
+ValueDefault=false
+
+[Indent Switch Pp]
+Category=2
+Description="<html>Whether to indent preprocessor statements inside of switch statements.<br/><br/>Default: true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_switch_pp=true|indent_switch_pp=false
+ValueDefault=true
+
+[Indent Case Shift]
+Category=2
+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="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Indent Col1 Comment]
+Category=2
+Description="<html>Whether to indent comments found in first column.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_col1_comment=true|indent_col1_comment=false
+ValueDefault=false
+
+[Indent Col1 Multi String Literal]
+Category=2
+Description="<html>Whether to indent multi string literal in first column.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_col1_multi_string_literal=true|indent_col1_multi_string_literal=false
+ValueDefault=false
+
+[Indent Label]
+Category=2
+Description="<html>How to indent goto labels.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_label="
+MinVal=-16
+MaxVal=16
+ValueDefault=1
+
+[Indent Access Spec]
+Category=2
+Description="<html>How to indent access specifiers that are followed by a<br/>colon.<br/><br/> &gt;0: Absolute column where 1 is the leftmost column<br/>&lt;=0: Subtract from brace indent<br/><br/>Default: 1</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_access_spec="
+MinVal=-16
+MaxVal=16
+ValueDefault=1
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_access_spec_body=true|indent_access_spec_body=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_paren_nl=true|indent_paren_nl=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_paren_close="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_paren_after_func_def=true|indent_paren_after_func_def=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_paren_after_func_decl=true|indent_paren_after_func_decl=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_paren_after_func_call=true|indent_paren_after_func_call=false
+ValueDefault=false
+
+[Indent Comma Brace]
+Category=2
+Description="<html>Whether to indent a comma when inside a brace.<br/>If true, aligns under the open brace.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_comma_brace=true|indent_comma_brace=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_comma_paren=true|indent_comma_paren=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_bool_paren=true|indent_bool_paren=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_semicolon_for_paren=true|indent_semicolon_for_paren=false
+ValueDefault=false
+
+[Indent First Bool Expr]
+Category=2
+Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=true.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_first_for_expr=true|indent_first_for_expr=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_square_nl=true|indent_square_nl=false
+ValueDefault=false
+
+[Indent Preserve Sql]
+Category=2
+Description="<html>(ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_align_assign=true|indent_align_assign=false
+ValueDefault=true
+
+[Indent Off After Assign]
+Category=2
+Description="<html>If true, the indentation of the chunks after a '=' sequence will be set at<br/>LHS token indentation column before '='.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_off_after_assign=true|indent_off_after_assign=false
+ValueDefault=false
+
+[Indent Align Paren]
+Category=2
+Description="<html>Whether to align continued statements at the '('. If false or the '(' is<br/>followed by a newline, the next line indent is one tab.<br/><br/>Default: true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_align_paren=true|indent_align_paren=false
+ValueDefault=true
+
+[Indent Oc Inside Msg Sel]
+Category=2
+Description="<html>(OC) Whether to indent Objective-C code inside message selectors.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_inside_msg_sel=true|indent_oc_inside_msg_sel=false
+ValueDefault=false
+
+[Indent Oc Block]
+Category=2
+Description="<html>(OC) Whether to indent Objective-C blocks at brace level instead of usual<br/>rules.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_block=true|indent_oc_block=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_oc_block_msg="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Indent Oc Msg Colon]
+Category=2
+Description="<html>(OC) Minimum indent for subsequent parameters</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_oc_msg_colon="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_msg_prioritize_first_colon=true|indent_oc_msg_prioritize_first_colon=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_block_msg_xcode_style=true|indent_oc_block_msg_xcode_style=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_block_msg_from_keyword=true|indent_oc_block_msg_from_keyword=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_block_msg_from_colon=true|indent_oc_block_msg_from_colon=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_block_msg_from_caret=true|indent_oc_block_msg_from_caret=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_oc_block_msg_from_brace=true|indent_oc_block_msg_from_brace=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_min_vbrace_open="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Indent Vbrace Open On Tabstop]
+Category=2
+Description="<html>Whether to add further spaces after regular indent to reach next tabstop<br/>when indenting after virtual brace open and newline.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_vbrace_open_on_tabstop=true|indent_vbrace_open_on_tabstop=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_token_after_brace=true|indent_token_after_brace=false
+ValueDefault=true
+
+[Indent Cpp Lambda Body]
+Category=2
+Description="<html>Whether to indent the body of a C++11 lambda.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_cpp_lambda_body=true|indent_cpp_lambda_body=false
+ValueDefault=false
+
+[Indent Compound Literal Return]
+Category=2
+Description="<html>How to indent compound literals that are being returned.<br/>true: add both the indent from return &amp; the compound literal open brace<br/>      (i.e. 2 indent levels)<br/>false: only indent 1 level, don't add the indent for the open brace, only<br/>       add the indent for the return.<br/><br/>Default: true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_compound_literal_return=true|indent_compound_literal_return=false
+ValueDefault=true
+
+[Indent Using Block]
+Category=2
+Description="<html>(C#) Whether to indent a 'using' block if no braces are used.<br/><br/>Default: true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_using_block=true|indent_using_block=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="indent_ternary_operator="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[Indent Inside Ternary Operator]
+Category=2
+Description="<html>Whether to indent the statements inside ternary operator.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_inside_ternary_operator=true|indent_inside_ternary_operator=false
+ValueDefault=false
+
+[Indent Off After Return]
+Category=2
+Description="<html>If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_off_after_return=true|indent_off_after_return=false
+ValueDefault=false
+
+[Indent Off After Return New]
+Category=2
+Description="<html>If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_off_after_return_new=true|indent_off_after_return_new=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_single_after_return=true|indent_single_after_return=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_asm_block=true|indent_ignore_asm_block=false
+ValueDefault=false
+
+[Donot Indent Func Def Close Paren]
+Category=2
+Description="<html>Don't indent the close parenthesis of a function definition,<br/>if the parenthesis is on its own line.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=donot_indent_func_def_close_paren=true|donot_indent_func_def_close_paren=false
+ValueDefault=false
+
+[Nl Collapse Empty Body]
+Category=3
+Description="<html>Whether to collapse empty blocks between '{' and '}'.<br/>If true, overrides nl_inside_empty_func</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false
+ValueDefault=false
+
+[Nl Assign Leave One Liners]
+Category=3
+Description="<html>Don't split one-line braced assignments, as in '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
+
+[Nl Class Leave One Liners]
+Category=3
+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
+
+[Nl Enum Leave One Liners]
+Category=3
+Description="<html>Don't split one-line enums, as in 'enum foo { BAR = 15 };'</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_enum_leave_one_liners=true|nl_enum_leave_one_liners=false
+ValueDefault=false
+
+[Nl Getset Leave One Liners]
+Category=3
+Description="<html>Don't split one-line get or set functions.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_getset_leave_one_liners=true|nl_getset_leave_one_liners=false
+ValueDefault=false
+
+[Nl Cs Property Leave One Liners]
+Category=3
+Description="<html>(C#) Don't split one-line property 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
+
+[Nl Func Leave One Liners]
+Category=3
+Description="<html>Don't split one-line function definitions, as in 'int foo() { return 0; }'.<br/>might modify nl_func_type_name</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_leave_one_liners=true|nl_func_leave_one_liners=false
+ValueDefault=false
+
+[Nl Cpp Lambda Leave One Liners]
+Category=3
+Description="<html>Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_cpp_lambda_leave_one_liners=true|nl_cpp_lambda_leave_one_liners=false
+ValueDefault=false
+
+[Nl If Leave One Liners]
+Category=3
+Description="<html>Don't split one-line if/else statements, as in 'if(...) b++;'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_if_leave_one_liners=true|nl_if_leave_one_liners=false
+ValueDefault=false
+
+[Nl While Leave One Liners]
+Category=3
+Description="<html>Don't split one-line while statements, as in 'while(...) b++;'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_while_leave_one_liners=true|nl_while_leave_one_liners=false
+ValueDefault=false
+
+[Nl Do Leave One Liners]
+Category=3
+Description="<html>Don't split one-line do statements, as in 'do { b++; } while(...);'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_do_leave_one_liners=true|nl_do_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
+
+[Nl Oc Msg Leave One Liner]
+Category=3
+Description="<html>(OC) Don't split one-line Objective-C 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|nl_oc_mdef_brace=not_defined
+ChoicesReadable="Ignore Nl Oc Mdef Brace|Add Nl Oc Mdef Brace|Remove Nl Oc Mdef Brace|Force Nl Oc Mdef Brace"
+ValueDefault=ignore
+
+[Nl Oc Block Brace]
+Category=3
+Description="<html>(OC) 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|nl_oc_block_brace=not_defined
+ChoicesReadable="Ignore Nl Oc Block Brace|Add Nl Oc Block Brace|Remove Nl Oc Block Brace|Force Nl Oc Block Brace"
+ValueDefault=ignore
+
+[Nl Oc Before Interface]
+Category=3
+Description="<html>(OC) Add or remove blank line before '@interface' statement.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_oc_before_interface=ignore|nl_oc_before_interface=add|nl_oc_before_interface=remove|nl_oc_before_interface=force|nl_oc_before_interface=not_defined
+ChoicesReadable="Ignore Nl Oc Before Interface|Add Nl Oc Before Interface|Remove Nl Oc Before Interface|Force Nl Oc Before Interface"
+ValueDefault=ignore
+
+[Nl Oc Before Implementation]
+Category=3
+Description="<html>(OC) Add or remove blank line before '@implementation' statement.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_oc_before_implementation=ignore|nl_oc_before_implementation=add|nl_oc_before_implementation=remove|nl_oc_before_implementation=force|nl_oc_before_implementation=not_defined
+ChoicesReadable="Ignore Nl Oc Before Implementation|Add Nl Oc Before Implementation|Remove Nl Oc Before Implementation|Force Nl Oc Before Implementation"
+ValueDefault=ignore
+
+[Nl Oc Before End]
+Category=3
+Description="<html>(OC) Add or remove blank line before '@end' statement.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_oc_before_end=ignore|nl_oc_before_end=add|nl_oc_before_end=remove|nl_oc_before_end=force|nl_oc_before_end=not_defined
+ChoicesReadable="Ignore Nl Oc Before End|Add Nl Oc Before End|Remove Nl Oc Before End|Force Nl Oc Before End"
+ValueDefault=ignore
+
+[Nl Oc Interface Brace]
+Category=3
+Description="<html>(OC) 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|nl_oc_interface_brace=not_defined
+ChoicesReadable="Ignore Nl Oc Interface Brace|Add Nl Oc Interface Brace|Remove Nl Oc Interface Brace|Force Nl Oc Interface Brace"
+ValueDefault=ignore
+
+[Nl Oc Implementation Brace]
+Category=3
+Description="<html>(OC) 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|nl_oc_implementation_brace=not_defined
+ChoicesReadable="Ignore Nl Oc Implementation Brace|Add Nl Oc Implementation Brace|Remove Nl Oc Implementation Brace|Force Nl Oc Implementation Brace"
+ValueDefault=ignore
+
+[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|nl_start_of_file=not_defined
+ChoicesReadable="Ignore Nl Start Of File|Add Nl Start Of File|Remove Nl Start Of File|Force Nl Start Of File"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_start_of_file_min="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl End Of File]
+Category=3
+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|nl_end_of_file=not_defined
+ChoicesReadable="Ignore Nl End Of File|Add Nl End Of File|Remove Nl End Of File|Force Nl End Of File"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_end_of_file_min="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Assign Brace]
+Category=3
+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|nl_assign_brace=not_defined
+ChoicesReadable="Ignore Nl Assign Brace|Add Nl Assign Brace|Remove Nl Assign Brace|Force Nl Assign Brace"
+ValueDefault=ignore
+
+[Nl Assign Square]
+Category=3
+Description="<html>(D) Add or remove newline between '=' and '['.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_assign_square=ignore|nl_assign_square=add|nl_assign_square=remove|nl_assign_square=force|nl_assign_square=not_defined
+ChoicesReadable="Ignore Nl Assign Square|Add Nl Assign Square|Remove Nl Assign Square|Force Nl Assign Square"
+ValueDefault=ignore
+
+[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|nl_tsquare_brace=not_defined
+ChoicesReadable="Ignore Nl Tsquare Brace|Add Nl Tsquare Brace|Remove Nl Tsquare Brace|Force Nl Tsquare Brace"
+ValueDefault=ignore
+
+[Nl After Square Assign]
+Category=3
+Description="<html>(D) Add or remove newline after '= ['. Will also affect the newline before<br/>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|nl_after_square_assign=not_defined
+ChoicesReadable="Ignore Nl After Square Assign|Add Nl After Square Assign|Remove Nl After Square Assign|Force Nl After Square Assign"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_fcall_brace=ignore|nl_fcall_brace=add|nl_fcall_brace=remove|nl_fcall_brace=force|nl_fcall_brace=not_defined
+ChoicesReadable="Ignore Nl Fcall Brace|Add Nl Fcall Brace|Remove Nl Fcall Brace|Force Nl Fcall Brace"
+ValueDefault=ignore
+
+[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|nl_enum_brace=not_defined
+ChoicesReadable="Ignore Nl Enum Brace|Add Nl Enum Brace|Remove Nl Enum Brace|Force Nl Enum Brace"
+ValueDefault=ignore
+
+[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|nl_enum_class=not_defined
+ChoicesReadable="Ignore Nl Enum Class|Add Nl Enum Class|Remove Nl Enum Class|Force Nl Enum Class"
+ValueDefault=ignore
+
+[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|nl_enum_class_identifier=not_defined
+ChoicesReadable="Ignore Nl Enum Class Identifier|Add Nl Enum Class Identifier|Remove Nl Enum Class Identifier|Force Nl Enum Class Identifier"
+ValueDefault=ignore
+
+[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|nl_enum_identifier_colon=not_defined
+ChoicesReadable="Ignore Nl Enum Identifier Colon|Add Nl Enum Identifier Colon|Remove Nl Enum Identifier Colon|Force Nl Enum Identifier Colon"
+ValueDefault=ignore
+
+[Nl Enum Colon Type]
+Category=3
+Description="<html>Add or remove newline between 'enum class identifier :' and 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|nl_enum_colon_type=not_defined
+ChoicesReadable="Ignore Nl Enum Colon Type|Add Nl Enum Colon Type|Remove Nl Enum Colon Type|Force Nl Enum Colon Type"
+ValueDefault=ignore
+
+[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|nl_struct_brace=not_defined
+ChoicesReadable="Ignore Nl Struct Brace|Add Nl Struct Brace|Remove Nl Struct Brace|Force Nl Struct Brace"
+ValueDefault=ignore
+
+[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|nl_union_brace=not_defined
+ChoicesReadable="Ignore Nl Union Brace|Add Nl Union Brace|Remove Nl Union Brace|Force Nl Union Brace"
+ValueDefault=ignore
+
+[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|nl_if_brace=not_defined
+ChoicesReadable="Ignore Nl If Brace|Add Nl If Brace|Remove Nl If Brace|Force Nl If Brace"
+ValueDefault=ignore
+
+[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|nl_brace_else=not_defined
+ChoicesReadable="Ignore Nl Brace Else|Add Nl Brace Else|Remove Nl Brace Else|Force Nl Brace Else"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_elseif_brace=ignore|nl_elseif_brace=add|nl_elseif_brace=remove|nl_elseif_brace=force|nl_elseif_brace=not_defined
+ChoicesReadable="Ignore Nl Elseif Brace|Add Nl Elseif Brace|Remove Nl Elseif Brace|Force Nl Elseif Brace"
+ValueDefault=ignore
+
+[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|nl_else_brace=not_defined
+ChoicesReadable="Ignore Nl Else Brace|Add Nl Else Brace|Remove Nl Else Brace|Force Nl Else Brace"
+ValueDefault=ignore
+
+[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|nl_else_if=not_defined
+ChoicesReadable="Ignore Nl Else If|Add Nl Else If|Remove Nl Else If|Force Nl Else If"
+ValueDefault=ignore
+
+[Nl Before Opening Brace Func Class Def]
+Category=3
+Description="<html>Add or remove newline before '{' opening brace</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_before_opening_brace_func_class_def=ignore|nl_before_opening_brace_func_class_def=add|nl_before_opening_brace_func_class_def=remove|nl_before_opening_brace_func_class_def=force|nl_before_opening_brace_func_class_def=not_defined
+ChoicesReadable="Ignore Nl Before Opening Brace Func Class Def|Add Nl Before Opening Brace Func Class Def|Remove Nl Before Opening Brace Func Class Def|Force Nl Before Opening Brace Func Class Def"
+ValueDefault=ignore
+
+[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|nl_before_if_closing_paren=not_defined
+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
+
+[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|nl_brace_finally=not_defined
+ChoicesReadable="Ignore Nl Brace Finally|Add Nl Brace Finally|Remove Nl Brace Finally|Force Nl Brace Finally"
+ValueDefault=ignore
+
+[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|nl_finally_brace=not_defined
+ChoicesReadable="Ignore Nl Finally Brace|Add Nl Finally Brace|Remove Nl Finally Brace|Force Nl Finally Brace"
+ValueDefault=ignore
+
+[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|nl_try_brace=not_defined
+ChoicesReadable="Ignore Nl Try Brace|Add Nl Try Brace|Remove Nl Try Brace|Force Nl Try Brace"
+ValueDefault=ignore
+
+[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|nl_getset_brace=not_defined
+ChoicesReadable="Ignore Nl Getset Brace|Add Nl Getset Brace|Remove Nl Getset Brace|Force Nl Getset Brace"
+ValueDefault=ignore
+
+[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|nl_for_brace=not_defined
+ChoicesReadable="Ignore Nl For Brace|Add Nl For Brace|Remove Nl For Brace|Force Nl For Brace"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_catch_brace=ignore|nl_catch_brace=add|nl_catch_brace=remove|nl_catch_brace=force|nl_catch_brace=not_defined
+ChoicesReadable="Ignore Nl Catch Brace|Add Nl Catch Brace|Remove Nl Catch Brace|Force Nl Catch Brace"
+ValueDefault=ignore
+
+[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>"
+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|nl_oc_catch_brace=not_defined
+ChoicesReadable="Ignore Nl Oc Catch Brace|Add Nl Oc Catch Brace|Remove Nl Oc Catch Brace|Force Nl Oc Catch Brace"
+ValueDefault=ignore
+
+[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|nl_brace_catch=not_defined
+ChoicesReadable="Ignore Nl Brace Catch|Add Nl Brace Catch|Remove Nl Brace Catch|Force Nl Brace Catch"
+ValueDefault=ignore
+
+[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>"
+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|nl_oc_brace_catch=not_defined
+ChoicesReadable="Ignore Nl Oc Brace Catch|Add Nl Oc Brace Catch|Remove Nl Oc Brace Catch|Force Nl Oc Brace Catch"
+ValueDefault=ignore
+
+[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|nl_brace_square=not_defined
+ChoicesReadable="Ignore Nl Brace Square|Add Nl Brace Square|Remove Nl Brace Square|Force Nl Brace Square"
+ValueDefault=ignore
+
+[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|nl_brace_fparen=not_defined
+ChoicesReadable="Ignore Nl Brace Fparen|Add Nl Brace Fparen|Remove Nl Brace Fparen|Force Nl Brace Fparen"
+ValueDefault=ignore
+
+[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|nl_while_brace=not_defined
+ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
+ValueDefault=ignore
+
+[Nl Scope Brace]
+Category=3
+Description="<html>(D) Add or remove newline between 'scope (x)' and '{'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_scope_brace=ignore|nl_scope_brace=add|nl_scope_brace=remove|nl_scope_brace=force|nl_scope_brace=not_defined
+ChoicesReadable="Ignore Nl Scope Brace|Add Nl Scope Brace|Remove Nl Scope Brace|Force Nl Scope Brace"
+ValueDefault=ignore
+
+[Nl Unittest Brace]
+Category=3
+Description="<html>(D) Add or remove newline between 'unittest' and '{'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_unittest_brace=ignore|nl_unittest_brace=add|nl_unittest_brace=remove|nl_unittest_brace=force|nl_unittest_brace=not_defined
+ChoicesReadable="Ignore Nl Unittest Brace|Add Nl Unittest Brace|Remove Nl Unittest Brace|Force Nl Unittest Brace"
+ValueDefault=ignore
+
+[Nl Version Brace]
+Category=3
+Description="<html>(D) Add or remove newline between 'version (x)' and '{'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_version_brace=ignore|nl_version_brace=add|nl_version_brace=remove|nl_version_brace=force|nl_version_brace=not_defined
+ChoicesReadable="Ignore Nl Version Brace|Add Nl Version Brace|Remove Nl Version Brace|Force Nl Version Brace"
+ValueDefault=ignore
+
+[Nl Using Brace]
+Category=3
+Description="<html>(C#) 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|nl_using_brace=not_defined
+ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_brace_brace=ignore|nl_brace_brace=add|nl_brace_brace=remove|nl_brace_brace=force|nl_brace_brace=not_defined
+ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
+ValueDefault=ignore
+
+[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|nl_do_brace=not_defined
+ChoicesReadable="Ignore Nl Do Brace|Add Nl Do Brace|Remove Nl Do Brace|Force Nl Do Brace"
+ValueDefault=ignore
+
+[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|nl_brace_while=not_defined
+ChoicesReadable="Ignore Nl Brace While|Add Nl Brace While|Remove Nl Brace While|Force Nl Brace While"
+ValueDefault=ignore
+
+[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|nl_switch_brace=not_defined
+ChoicesReadable="Ignore Nl Switch Brace|Add Nl Switch Brace|Remove Nl Switch Brace|Force Nl Switch Brace"
+ValueDefault=ignore
+
+[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|nl_synchronized_brace=not_defined
+ChoicesReadable="Ignore Nl Synchronized Brace|Add Nl Synchronized Brace|Remove Nl Synchronized Brace|Force Nl Synchronized Brace"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_multi_line_cond=true|nl_multi_line_cond=false
+ValueDefault=false
+
+[Nl Multi Line Sparen Open]
+Category=3
+Description="<html>Add a newline after '(' if an if/for/while/switch condition spans multiple<br/>lines</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_multi_line_sparen_open=ignore|nl_multi_line_sparen_open=add|nl_multi_line_sparen_open=remove|nl_multi_line_sparen_open=force|nl_multi_line_sparen_open=not_defined
+ChoicesReadable="Ignore Nl Multi Line Sparen Open|Add Nl Multi Line Sparen Open|Remove Nl Multi Line Sparen Open|Force Nl Multi Line Sparen Open"
+ValueDefault=ignore
+
+[Nl Multi Line Sparen Close]
+Category=3
+Description="<html>Add a newline before ')' if an if/for/while/switch condition spans multiple<br/>lines. Overrides nl_before_if_closing_paren if both are specified.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_multi_line_sparen_close=ignore|nl_multi_line_sparen_close=add|nl_multi_line_sparen_close=remove|nl_multi_line_sparen_close=force|nl_multi_line_sparen_close=not_defined
+ChoicesReadable="Ignore Nl Multi Line Sparen Close|Add Nl Multi Line Sparen Close|Remove Nl Multi Line Sparen Close|Force Nl Multi Line Sparen Close"
+ValueDefault=ignore
+
+[Nl Multi Line Define]
+Category=3
+Description="<html>Force a newline in a define after the macro name for multi-line defines.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_multi_line_define=true|nl_multi_line_define=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_before_case=true|nl_before_case=false
+ValueDefault=false
+
+[Nl After Case]
+Category=3
+Description="<html>Whether to add a newline after a 'case' statement.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_case=true|nl_after_case=false
+ValueDefault=false
+
+[Nl Case Colon Brace]
+Category=3
+Description="<html>Add or remove newline between a case ':' and '{'.<br/><br/>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|nl_case_colon_brace=not_defined
+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|nl_before_throw=not_defined
+ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
+ValueDefault=ignore
+
+[Nl Namespace Brace]
+Category=3
+Description="<html>Add or remove 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|nl_namespace_brace=not_defined
+ChoicesReadable="Ignore Nl Namespace Brace|Add Nl Namespace Brace|Remove Nl Namespace Brace|Force Nl Namespace Brace"
+ValueDefault=ignore
+
+[Nl Template Class]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_class=ignore|nl_template_class=add|nl_template_class=remove|nl_template_class=force|nl_template_class=not_defined
+ChoicesReadable="Ignore Nl Template Class|Add Nl Template Class|Remove Nl Template Class|Force Nl Template Class"
+ValueDefault=ignore
+
+[Nl Template Class Decl]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class declaration.<br/><br/>Overrides nl_template_class.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_class_decl=ignore|nl_template_class_decl=add|nl_template_class_decl=remove|nl_template_class_decl=force|nl_template_class_decl=not_defined
+ChoicesReadable="Ignore Nl Template Class Decl|Add Nl Template Class Decl|Remove Nl Template Class Decl|Force Nl Template Class Decl"
+ValueDefault=ignore
+
+[Nl Template Class Decl Special]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class declaration.<br/><br/>Overrides nl_template_class_decl.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_class_decl_special=ignore|nl_template_class_decl_special=add|nl_template_class_decl_special=remove|nl_template_class_decl_special=force|nl_template_class_decl_special=not_defined
+ChoicesReadable="Ignore Nl Template Class Decl Special|Add Nl Template Class Decl Special|Remove Nl Template Class Decl Special|Force Nl Template Class Decl Special"
+ValueDefault=ignore
+
+[Nl Template Class Def]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class definition.<br/><br/>Overrides nl_template_class.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_class_def=ignore|nl_template_class_def=add|nl_template_class_def=remove|nl_template_class_def=force|nl_template_class_def=not_defined
+ChoicesReadable="Ignore Nl Template Class Def|Add Nl Template Class Def|Remove Nl Template Class Def|Force Nl Template Class Def"
+ValueDefault=ignore
+
+[Nl Template Class Def Special]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class definition.<br/><br/>Overrides nl_template_class_def.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_class_def_special=ignore|nl_template_class_def_special=add|nl_template_class_def_special=remove|nl_template_class_def_special=force|nl_template_class_def_special=not_defined
+ChoicesReadable="Ignore Nl Template Class Def Special|Add Nl Template Class Def Special|Remove Nl Template Class Def Special|Force Nl Template Class Def Special"
+ValueDefault=ignore
+
+[Nl Template Func]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_func=ignore|nl_template_func=add|nl_template_func=remove|nl_template_func=force|nl_template_func=not_defined
+ChoicesReadable="Ignore Nl Template Func|Add Nl Template Func|Remove Nl Template Func|Force Nl Template Func"
+ValueDefault=ignore
+
+[Nl Template Func Decl]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>declaration.<br/><br/>Overrides nl_template_func.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_func_decl=ignore|nl_template_func_decl=add|nl_template_func_decl=remove|nl_template_func_decl=force|nl_template_func_decl=not_defined
+ChoicesReadable="Ignore Nl Template Func Decl|Add Nl Template Func Decl|Remove Nl Template Func Decl|Force Nl Template Func Decl"
+ValueDefault=ignore
+
+[Nl Template Func Decl Special]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>declaration.<br/><br/>Overrides nl_template_func_decl.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_func_decl_special=ignore|nl_template_func_decl_special=add|nl_template_func_decl_special=remove|nl_template_func_decl_special=force|nl_template_func_decl_special=not_defined
+ChoicesReadable="Ignore Nl Template Func Decl Special|Add Nl Template Func Decl Special|Remove Nl Template Func Decl Special|Force Nl Template Func Decl Special"
+ValueDefault=ignore
+
+[Nl Template Func Def]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>definition.<br/><br/>Overrides nl_template_func.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_func_def=ignore|nl_template_func_def=add|nl_template_func_def=remove|nl_template_func_def=force|nl_template_func_def=not_defined
+ChoicesReadable="Ignore Nl Template Func Def|Add Nl Template Func Def|Remove Nl Template Func Def|Force Nl Template Func Def"
+ValueDefault=ignore
+
+[Nl Template Func Def Special]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>definition.<br/><br/>Overrides nl_template_func_def.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_func_def_special=ignore|nl_template_func_def_special=add|nl_template_func_def_special=remove|nl_template_func_def_special=force|nl_template_func_def_special=not_defined
+ChoicesReadable="Ignore Nl Template Func Def Special|Add Nl Template Func Def Special|Remove Nl Template Func Def Special|Force Nl Template Func Def Special"
+ValueDefault=ignore
+
+[Nl Template Var]
+Category=3
+Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template variable.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_var=ignore|nl_template_var=add|nl_template_var=remove|nl_template_var=force|nl_template_var=not_defined
+ChoicesReadable="Ignore Nl Template Var|Add Nl Template Var|Remove Nl Template Var|Force Nl Template Var"
+ValueDefault=ignore
+
+[Nl Template Using]
+Category=3
+Description="<html>Add or remove newline between 'template&lt;...&gt;' and 'using' of a templated<br/>type alias.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_template_using=ignore|nl_template_using=add|nl_template_using=remove|nl_template_using=force|nl_template_using=not_defined
+ChoicesReadable="Ignore Nl Template Using|Add Nl Template Using|Remove Nl Template Using|Force Nl Template Using"
+ValueDefault=ignore
+
+[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|nl_class_brace=not_defined
+ChoicesReadable="Ignore Nl Class Brace|Add Nl Class Brace|Remove Nl Class Brace|Force Nl Class Brace"
+ValueDefault=ignore
+
+[Nl Class Init Args]
+Category=3
+Description="<html>Add or remove newline before or after (depending on pos_class_comma,<br/>may not be IGNORE) each',' in the base class list.</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|nl_class_init_args=not_defined
+ChoicesReadable="Ignore Nl Class Init Args|Add Nl Class Init Args|Remove Nl Class Init Args|Force Nl Class Init Args"
+ValueDefault=ignore
+
+[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>"
+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|nl_constr_init_args=not_defined
+ChoicesReadable="Ignore Nl Constr Init Args|Add Nl Constr Init Args|Remove Nl Constr Init Args|Force Nl Constr Init Args"
+ValueDefault=ignore
+
+[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>"
+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|nl_enum_own_lines=not_defined
+ChoicesReadable="Ignore Nl Enum Own Lines|Add Nl Enum Own Lines|Remove Nl Enum Own Lines|Force Nl Enum Own Lines"
+ValueDefault=ignore
+
+[Nl Func Type Name]
+Category=3
+Description="<html>Add or remove newline between return type and function name in a function<br/>definition.<br/>might be modified by nl_func_leave_one_liners</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|nl_func_type_name=not_defined
+ChoicesReadable="Ignore Nl Func Type Name|Add Nl Func Type Name|Remove Nl Func Type Name|Force Nl Func Type Name"
+ValueDefault=ignore
+
+[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>"
+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|nl_func_type_name_class=not_defined
+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
+
+[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>"
+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|nl_func_class_scope=not_defined
+ChoicesReadable="Ignore Nl Func Class Scope|Add Nl Func Class Scope|Remove Nl Func Class Scope|Force Nl Func Class Scope"
+ValueDefault=ignore
+
+[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>"
+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|nl_func_scope_name=not_defined
+ChoicesReadable="Ignore Nl Func Scope Name|Add Nl Func Scope Name|Remove Nl Func Scope Name|Force Nl Func Scope Name"
+ValueDefault=ignore
+
+[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|nl_func_proto_type_name=not_defined
+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
+
+[Nl Func Paren]
+Category=3
+Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>declaration.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_func_paren=ignore|nl_func_paren=add|nl_func_paren=remove|nl_func_paren=force|nl_func_paren=not_defined
+ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren"
+ValueDefault=ignore
+
+[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|nl_func_paren_empty=not_defined
+ChoicesReadable="Ignore Nl Func Paren Empty|Add Nl Func Paren Empty|Remove Nl Func Paren Empty|Force Nl Func Paren Empty"
+ValueDefault=ignore
+
+[Nl Func Def Paren]
+Category=3
+Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>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|nl_func_def_paren=not_defined
+ChoicesReadable="Ignore Nl Func Def Paren|Add Nl Func Def Paren|Remove Nl Func Def Paren|Force Nl Func Def Paren"
+ValueDefault=ignore
+
+[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|nl_func_def_paren_empty=not_defined
+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
+
+[Nl Func Call Paren]
+Category=3
+Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>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|nl_func_call_paren=not_defined
+ChoicesReadable="Ignore Nl Func Call Paren|Add Nl Func Call Paren|Remove Nl Func Call Paren|Force Nl Func Call Paren"
+ValueDefault=ignore
+
+[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|nl_func_call_paren_empty=not_defined
+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
+
+[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|nl_func_decl_start=not_defined
+ChoicesReadable="Ignore Nl Func Decl Start|Add Nl Func Decl Start|Remove Nl Func Decl Start|Force Nl Func Decl Start"
+ValueDefault=ignore
+
+[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|nl_func_def_start=not_defined
+ChoicesReadable="Ignore Nl Func Def Start|Add Nl Func Def Start|Remove Nl Func Def Start|Force Nl Func Def Start"
+ValueDefault=ignore
+
+[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|nl_func_decl_start_single=not_defined
+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
+
+[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|nl_func_def_start_single=not_defined
+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
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_decl_start_multi_line=true|nl_func_decl_start_multi_line=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_def_start_multi_line=true|nl_func_def_start_multi_line=false
+ValueDefault=false
+
+[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|nl_func_decl_args=not_defined
+ChoicesReadable="Ignore Nl Func Decl Args|Add Nl Func Decl Args|Remove Nl Func Decl Args|Force Nl Func Decl Args"
+ValueDefault=ignore
+
+[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|nl_func_def_args=not_defined
+ChoicesReadable="Ignore Nl Func Def Args|Add Nl Func Def Args|Remove Nl Func Def Args|Force Nl Func Def Args"
+ValueDefault=ignore
+
+[Nl Func Call Args]
+Category=3
+Description="<html>Add or remove newline after each ',' in a function call.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_func_call_args=ignore|nl_func_call_args=add|nl_func_call_args=remove|nl_func_call_args=force|nl_func_call_args=not_defined
+ChoicesReadable="Ignore Nl Func Call Args|Add Nl Func Call Args|Remove Nl Func Call Args|Force Nl Func Call Args"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_decl_args_multi_line=true|nl_func_decl_args_multi_line=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_def_args_multi_line=true|nl_func_def_args_multi_line=false
+ValueDefault=false
+
+[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|nl_func_decl_end=not_defined
+ChoicesReadable="Ignore Nl Func Decl End|Add Nl Func Decl End|Remove Nl Func Decl End|Force Nl Func Decl End"
+ValueDefault=ignore
+
+[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|nl_func_def_end=not_defined
+ChoicesReadable="Ignore Nl Func Def End|Add Nl Func Def End|Remove Nl Func Def End|Force Nl Func Def End"
+ValueDefault=ignore
+
+[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|nl_func_decl_end_single=not_defined
+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
+
+[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|nl_func_def_end_single=not_defined
+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
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_decl_end_multi_line=true|nl_func_decl_end_multi_line=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_def_end_multi_line=true|nl_func_def_end_multi_line=false
+ValueDefault=false
+
+[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|nl_func_decl_empty=not_defined
+ChoicesReadable="Ignore Nl Func Decl Empty|Add Nl Func Decl Empty|Remove Nl Func Decl Empty|Force Nl Func Decl Empty"
+ValueDefault=ignore
+
+[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|nl_func_def_empty=not_defined
+ChoicesReadable="Ignore Nl Func Def Empty|Add Nl Func Def Empty|Remove Nl Func Def Empty|Force Nl Func Def Empty"
+ValueDefault=ignore
+
+[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|nl_func_call_empty=not_defined
+ChoicesReadable="Ignore Nl Func Call Empty|Add Nl Func Call Empty|Remove Nl Func Call Empty|Force Nl Func Call Empty"
+ValueDefault=ignore
+
+[Nl Func Call Start]
+Category=3
+Description="<html>Whether to add a newline after '(' in a function call,<br/>has preference over nl_func_call_start_multi_line.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_func_call_start=ignore|nl_func_call_start=add|nl_func_call_start=remove|nl_func_call_start=force|nl_func_call_start=not_defined
+ChoicesReadable="Ignore Nl Func Call Start|Add Nl Func Call Start|Remove Nl Func Call Start|Force Nl Func Call Start"
+ValueDefault=ignore
+
+[Nl Func Call End]
+Category=3
+Description="<html>Whether to add a newline before ')' in a function call.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_func_call_end=ignore|nl_func_call_end=add|nl_func_call_end=remove|nl_func_call_end=force|nl_func_call_end=not_defined
+ChoicesReadable="Ignore Nl Func Call End|Add Nl Func Call End|Remove Nl Func Call End|Force Nl Func Call End"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_call_start_multi_line=true|nl_func_call_start_multi_line=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_call_args_multi_line=true|nl_func_call_args_multi_line=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_call_end_multi_line=true|nl_func_call_end_multi_line=false
+ValueDefault=false
+
+[Nl Func Call Args Multi Line Ignore Closures]
+Category=3
+Description="<html>Whether to respect nl_func_call_XXX option in case of closure args.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_func_call_args_multi_line_ignore_closures=true|nl_func_call_args_multi_line_ignore_closures=false
+ValueDefault=false
+
+[Nl Template Start]
+Category=3
+Description="<html>Whether to add a newline after '&lt;' of a template parameter list.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_template_start=true|nl_template_start=false
+ValueDefault=false
+
+[Nl Template Args]
+Category=3
+Description="<html>Whether to add a newline after each ',' in a template parameter list.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_template_args=true|nl_template_args=false
+ValueDefault=false
+
+[Nl Template End]
+Category=3
+Description="<html>Whether to add a newline before '&gt;' of a template parameter list.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_template_end=true|nl_template_end=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_oc_msg_args=true|nl_oc_msg_args=false
+ValueDefault=false
+
+[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|nl_fdef_brace=not_defined
+ChoicesReadable="Ignore Nl Fdef Brace|Add Nl Fdef Brace|Remove Nl Fdef Brace|Force Nl Fdef Brace"
+ValueDefault=ignore
+
+[Nl Fdef Brace Cond]
+Category=3
+Description="<html>Add or remove newline between function signature and '{',<br/>if signature ends with ')'. Overrides nl_fdef_brace.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_fdef_brace_cond=ignore|nl_fdef_brace_cond=add|nl_fdef_brace_cond=remove|nl_fdef_brace_cond=force|nl_fdef_brace_cond=not_defined
+ChoicesReadable="Ignore Nl Fdef Brace Cond|Add Nl Fdef Brace Cond|Remove Nl Fdef Brace Cond|Force Nl Fdef Brace Cond"
+ValueDefault=ignore
+
+[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|nl_cpp_ldef_brace=not_defined
+ChoicesReadable="Ignore Nl Cpp Ldef Brace|Add Nl Cpp Ldef Brace|Remove Nl Cpp Ldef Brace|Force Nl Cpp Ldef Brace"
+ValueDefault=ignore
+
+[Nl Return Expr]
+Category=3
+Description="<html>Add or remove newline between 'return' and the return expression.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_return_expr=ignore|nl_return_expr=add|nl_return_expr=remove|nl_return_expr=force|nl_return_expr=not_defined
+ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
+ValueDefault=ignore
+
+[Nl After Semicolon]
+Category=3
+Description="<html>Whether to add a newline after semicolons, except in 'for' statements.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_semicolon=true|nl_after_semicolon=false
+ValueDefault=false
+
+[Nl Paren Dbrace Open]
+Category=3
+Description="<html>(Java) Add or remove newline between the ')' and '{{' of the double brace<br/>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|nl_paren_dbrace_open=not_defined
+ChoicesReadable="Ignore Nl Paren Dbrace Open|Add Nl Paren Dbrace Open|Remove Nl Paren Dbrace Open|Force Nl Paren Dbrace Open"
+ValueDefault=ignore
+
+[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>"
+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|nl_type_brace_init_lst=not_defined
+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
+
+[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>"
+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|nl_type_brace_init_lst_open=not_defined
+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
+
+[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>"
+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|nl_type_brace_init_lst_close=not_defined
+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
+
+[Nl After Brace Open]
+Category=3
+Description="<html>Whether to add a newline after '{'. This also adds a newline before the<br/>matching '}'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_brace_open=true|nl_after_brace_open=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_brace_open_cmt=true|nl_after_brace_open_cmt=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_vbrace_open=true|nl_after_vbrace_open=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_vbrace_open_empty=true|nl_after_vbrace_open_empty=false
+ValueDefault=false
+
+[Nl After Brace Close]
+Category=3
+Description="<html>Whether to add a newline after '}'. Does not apply if followed by a<br/>necessary ';'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_brace_close=true|nl_after_brace_close=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_vbrace_close=true|nl_after_vbrace_close=false
+ValueDefault=false
+
+[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>"
+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|nl_brace_struct_var=not_defined
+ChoicesReadable="Ignore Nl Brace Struct Var|Add Nl Brace Struct Var|Remove Nl Brace Struct Var|Force Nl Brace Struct Var"
+ValueDefault=ignore
+
+[Nl Define Macro]
+Category=3
+Description="<html>Whether to alter newlines in '#define' macros.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_define_macro=true|nl_define_macro=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_squeeze_paren_close=true|nl_squeeze_paren_close=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_squeeze_ifdef=true|nl_squeeze_ifdef=false
+ValueDefault=false
+
+[Nl Squeeze Ifdef Top Level]
+Category=3
+Description="<html>Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_squeeze_ifdef_top_level=true|nl_squeeze_ifdef_top_level=false
+ValueDefault=false
+
+[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|nl_before_if=not_defined
+ChoicesReadable="Ignore Nl Before If|Add Nl Before If|Remove Nl Before If|Force Nl Before If"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force|nl_after_if=not_defined
+ChoicesReadable="Ignore Nl After If|Add Nl After If|Remove Nl After If|Force Nl After If"
+ValueDefault=ignore
+
+[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|nl_before_for=not_defined
+ChoicesReadable="Ignore Nl Before For|Add Nl Before For|Remove Nl Before For|Force Nl Before For"
+ValueDefault=ignore
+
+[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|nl_after_for=not_defined
+ChoicesReadable="Ignore Nl After For|Add Nl After For|Remove Nl After For|Force Nl After For"
+ValueDefault=ignore
+
+[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|nl_before_while=not_defined
+ChoicesReadable="Ignore Nl Before While|Add Nl Before While|Remove Nl Before While|Force Nl Before While"
+ValueDefault=ignore
+
+[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|nl_after_while=not_defined
+ChoicesReadable="Ignore Nl After While|Add Nl After While|Remove Nl After While|Force Nl After While"
+ValueDefault=ignore
+
+[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|nl_before_switch=not_defined
+ChoicesReadable="Ignore Nl Before Switch|Add Nl Before Switch|Remove Nl Before Switch|Force Nl Before Switch"
+ValueDefault=ignore
+
+[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|nl_after_switch=not_defined
+ChoicesReadable="Ignore Nl After Switch|Add Nl After Switch|Remove Nl After Switch|Force Nl After Switch"
+ValueDefault=ignore
+
+[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|nl_before_synchronized=not_defined
+ChoicesReadable="Ignore Nl Before Synchronized|Add Nl Before Synchronized|Remove Nl Before Synchronized|Force Nl Before Synchronized"
+ValueDefault=ignore
+
+[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|nl_after_synchronized=not_defined
+ChoicesReadable="Ignore Nl After Synchronized|Add Nl After Synchronized|Remove Nl After Synchronized|Force Nl After Synchronized"
+ValueDefault=ignore
+
+[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|nl_before_do=not_defined
+ChoicesReadable="Ignore Nl Before Do|Add Nl Before Do|Remove Nl Before Do|Force Nl Before Do"
+ValueDefault=ignore
+
+[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|nl_after_do=not_defined
+ChoicesReadable="Ignore Nl After Do|Add Nl After Do|Remove Nl After Do|Force Nl After Do"
+ValueDefault=ignore
+
+[Nl Before Return]
+Category=3
+Description="<html>Whether to put a blank line before 'return' statements, unless after an open<br/>brace.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_before_return=true|nl_before_return=false
+ValueDefault=false
+
+[Nl After Return]
+Category=3
+Description="<html>Whether to put a blank line after 'return' statements, unless followed by a<br/>close brace.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_return=true|nl_after_return=false
+ValueDefault=false
+
+[Nl Before Member]
+Category=3
+Description="<html>Whether to put a blank line before a member '.' or '-&gt;' operators.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_before_member=ignore|nl_before_member=add|nl_before_member=remove|nl_before_member=force|nl_before_member=not_defined
+ChoicesReadable="Ignore Nl Before Member|Add Nl Before Member|Remove Nl Before Member|Force Nl Before Member"
+ValueDefault=ignore
+
+[Nl After Member]
+Category=3
+Description="<html>(Java) Whether to put a blank line after a member '.' or '-&gt;' operators.</html>"
+Enabled=false
+EditorType=multiple
+Choices=nl_after_member=ignore|nl_after_member=add|nl_after_member=remove|nl_after_member=force|nl_after_member=not_defined
+ChoicesReadable="Ignore Nl After Member|Add Nl After Member|Remove Nl After Member|Force Nl After Member"
+ValueDefault=ignore
+
+[Nl Ds Struct Enum Cmt]
+Category=3
+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
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_ds_struct_enum_close_brace=true|nl_ds_struct_enum_close_brace=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force|nl_class_colon=not_defined
+ChoicesReadable="Ignore Nl Class Colon|Add Nl Class Colon|Remove Nl Class Colon|Force Nl Class Colon"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_constr_colon=ignore|nl_constr_colon=add|nl_constr_colon=remove|nl_constr_colon=force|nl_constr_colon=not_defined
+ChoicesReadable="Ignore Nl Constr Colon|Add Nl Constr Colon|Remove Nl Constr Colon|Force Nl Constr Colon"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_namespace_two_to_one_liner=true|nl_namespace_two_to_one_liner=false
+ValueDefault=false
+
+[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++;' =&gt; 'if(b) i++;'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_create_if_one_liner=true|nl_create_if_one_liner=false
+ValueDefault=false
+
+[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;' =&gt; 'for (...) stmt;'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_create_for_one_liner=true|nl_create_for_one_liner=false
+ValueDefault=false
+
+[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;' =&gt; 'while (expr) stmt;'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_create_while_one_liner=true|nl_create_while_one_liner=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_create_func_def_one_liner=true|nl_create_func_def_one_liner=false
+ValueDefault=false
+
+[Nl Create List One Liner]
+Category=3
+Description="<html>Whether to split one-line simple unbraced if statements into three lines by<br/>adding newlines, as in 'int a[12] = { &lt;here&gt; 0 &lt;here&gt; };'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_create_list_one_liner=true|nl_create_list_one_liner=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_split_if_one_liner=true|nl_split_if_one_liner=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_split_for_one_liner=true|nl_split_for_one_liner=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_split_while_one_liner=true|nl_split_while_one_liner=false
+ValueDefault=false
+
+[Donot Add Nl Before Cpp Comment]
+Category=3
+Description="<html>Don't add a newline before a cpp-comment in a parameter list of a function<br/>call.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=donot_add_nl_before_cpp_comment=true|donot_add_nl_before_cpp_comment=false
+ValueDefault=false
+
+[Nl Max]
+Category=4
+Description="<html>The maximum number of consecutive newlines (3 = 2 blank lines).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_max="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Max Blank In Func]
+Category=4
+Description="<html>The maximum number of consecutive newlines in a function.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_max_blank_in_func="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Inside Empty Func]
+Category=4
+Description="<html>The number of newlines inside an empty function body.<br/>This option overrides eat_blanks_after_open_brace and<br/>eat_blanks_before_close_brace, but is ignored when<br/>nl_collapse_empty_body=true</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_inside_empty_func="
+MinVal=0
+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. Where<br/>applicable, this option is overridden with eat_blanks_after_open_brace=true</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_func_body_def="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Before Func Class Proto]
+Category=4
+Description="<html>The number of newlines before a class constructor/destructor prototype.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_func_class_proto="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Before Func Class Def]
+Category=4
+Description="<html>The number of newlines before a class constructor/destructor definition.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_func_class_def="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Func Proto]
+Category=4
+Description="<html>The number of newlines after a function prototype.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_proto="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Func Proto Group]
+Category=4
+Description="<html>The number of newlines after a function prototype, if not followed by<br/>another function prototype.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_proto_group="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Func Class Proto]
+Category=4
+Description="<html>The number of newlines after a class constructor/destructor prototype.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_class_proto="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Func Class Proto Group]
+Category=4
+Description="<html>The number of newlines after a class constructor/destructor prototype,<br/>if not followed by another constructor/destructor prototype.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_class_proto_group="
+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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_body="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_body_class="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_body_one_liner="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Func Var Def Blk]
+Category=4
+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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_func_var_def_blk="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Typedef Blk Start]
+Category=4
+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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_typedef_blk_start="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Typedef Blk End]
+Category=4
+Description="<html>The number of newlines after a block of typedefs.<br/><br/>0: No change (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_typedef_blk_end="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Typedef Blk In]
+Category=4
+Description="<html>The maximum number of consecutive newlines within a block of typedefs.<br/><br/>0: No change (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_typedef_blk_in="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Var Def Blk Start]
+Category=4
+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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_var_def_blk_start="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Var Def Blk End]
+Category=4
+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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_var_def_blk_end="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Var Def Blk In]
+Category=4
+Description="<html>The maximum number of consecutive newlines within a block of variable<br/>definitions.<br/><br/>0: No change (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_var_def_blk_in="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_block_comment="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_c_comment="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_cpp_comment="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Multiline Comment]
+Category=4
+Description="<html>Whether to force a newline after a multi-line comment.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_multiline_comment=true|nl_after_multiline_comment=false
+ValueDefault=false
+
+[Nl After Label Colon]
+Category=4
+Description="<html>Whether to force a newline after a label's colon.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_after_label_colon=true|nl_after_label_colon=false
+ValueDefault=false
+
+[Nl After Struct]
+Category=4
+Description="<html>The number of newlines after '}' or ';' of a struct/enum/union definition.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_struct="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Before Class]
+Category=4
+Description="<html>The number of newlines before a class definition.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_class="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Class]
+Category=4
+Description="<html>The number of newlines after '}' or ';' of a class definition.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_class="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Before Namespace]
+Category=4
+Description="<html>The number of newlines before a namespace.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_namespace="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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
+
+[Nl After Namespace]
+Category=4
+Description="<html>The number of newlines after '}' of a namespace.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_namespace="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_access_spec="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_access_spec="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_comment_func_def="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_try_catch_finally="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_around_cs_property="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_between_get_set="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Property Brace]
+Category=4
+Description="<html>(C#) Add or remove newline between 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|nl_property_brace=not_defined
+ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
+ValueDefault=ignore
+
+[Eat Blanks After Open Brace]
+Category=4
+Description="<html>Whether to remove blank lines after '{'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=eat_blanks_after_open_brace=true|eat_blanks_after_open_brace=false
+ValueDefault=false
+
+[Eat Blanks Before Close Brace]
+Category=4
+Description="<html>Whether to remove blank lines before '}'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=eat_blanks_before_close_brace=true|eat_blanks_before_close_brace=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="nl_remove_extra_newlines="
+MinVal=0
+MaxVal=2
+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>"
+Enabled=false
+EditorType=multiple
+Choices=nl_after_annotation=ignore|nl_after_annotation=add|nl_after_annotation=remove|nl_after_annotation=force|nl_after_annotation=not_defined
+ChoicesReadable="Ignore Nl After Annotation|Add Nl After Annotation|Remove Nl After Annotation|Force Nl After Annotation"
+ValueDefault=ignore
+
+[Nl Between Annotation]
+Category=4
+Description="<html>(Java) Add or remove 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|nl_between_annotation=not_defined
+ChoicesReadable="Ignore Nl Between Annotation|Add Nl Between Annotation|Remove Nl Between Annotation|Force Nl Between Annotation"
+ValueDefault=ignore
+
+[Nl Before Whole File Ifdef]
+Category=4
+Description="<html>The number of newlines before a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_whole_file_ifdef="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Whole File Ifdef]
+Category=4
+Description="<html>The number of newlines after a whole-file #ifdef.<br/><br/>0: No change (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_whole_file_ifdef="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Before Whole File Endif]
+Category=4
+Description="<html>The number of newlines before a whole-file #endif.<br/><br/>0: No change (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_before_whole_file_endif="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Whole File Endif]
+Category=4
+Description="<html>The number of newlines after a whole-file #endif.<br/><br/>0: No change (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_whole_file_endif="
+MinVal=0
+MaxVal=16
+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
+ChoicesReadable="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 Pos Arith"
+ValueDefault=ignore
+
+[Pos Assign]
+Category=5
+Description="<html>The position of assignment in wrapped expressions. Do not affect '='<br/>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
+ChoicesReadable="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 Pos Assign"
+ValueDefault=ignore
+
+[Pos Bool]
+Category=5
+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
+ChoicesReadable="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 Pos Bool"
+ValueDefault=ignore
+
+[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
+ChoicesReadable="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 Pos Compare"
+ValueDefault=ignore
+
+[Pos Conditional]
+Category=5
+Description="<html>The position of conditional operators, as in the '?' and ':' of<br/>'expr ? stmt : stmt', 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
+ChoicesReadable="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 Pos Conditional"
+ValueDefault=ignore
+
+[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
+ChoicesReadable="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 Pos Comma"
+ValueDefault=ignore
+
+[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
+ChoicesReadable="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 Pos Enum Comma"
+ValueDefault=ignore
+
+[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>"
+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
+ChoicesReadable="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 Pos Class Comma"
+ValueDefault=ignore
+
+[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>"
+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
+ChoicesReadable="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 Pos Constr Comma"
+ValueDefault=ignore
+
+[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>"
+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
+ChoicesReadable="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 Pos Class Colon"
+ValueDefault=ignore
+
+[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>"
+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
+ChoicesReadable="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 Pos Constr Colon"
+ValueDefault=ignore
+
+[Pos Shift]
+Category=5
+Description="<html>The position of shift operators in wrapped expressions.</html>"
+Enabled=false
+EditorType=multiple
+Choices=pos_shift=ignore|pos_shift=break|pos_shift=force|pos_shift=lead|pos_shift=trail|pos_shift=join|pos_shift=lead_break|pos_shift=lead_force|pos_shift=trail_break|pos_shift=trail_force
+ChoicesReadable="Ignore Pos Shift|Break Pos Shift|Force Pos Shift|Lead Pos Shift|Trail Pos Shift|Join Pos Shift|Lead Break Pos Shift|Lead Force Pos Shift|Trail Break Pos Shift|Trail Force Pos Shift"
+ValueDefault=ignore
+
+[Code Width]
+Category=6
+Description="<html>Try to limit code width to N columns.</html>"
+Enabled=false
+EditorType=numeric
+CallName="code_width="
+MinVal=0
+MaxVal=10000
+ValueDefault=0
+
+[Ls For Split Full]
+Category=6
+Description="<html>Whether to fully split long 'for' statements at semi-colons.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=ls_for_split_full=true|ls_for_split_full=false
+ValueDefault=false
+
+[Ls Func Split Full]
+Category=6
+Description="<html>Whether to fully split long function prototypes/calls at commas.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=ls_func_split_full=true|ls_func_split_full=false
+ValueDefault=false
+
+[Ls Code Width]
+Category=6
+Description="<html>Whether to split lines as close to code_width as possible and ignore some<br/>groupings.<br/>The option ls_code_width has priority over the option ls_func_split_full.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=ls_code_width=true|ls_code_width=false
+ValueDefault=false
+
+[Align Keep Tabs]
+Category=7
+Description="<html>Whether to keep non-indenting tabs.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_keep_tabs=true|align_keep_tabs=false
+ValueDefault=false
+
+[Align With Tabs]
+Category=7
+Description="<html>Whether to use tabs for aligning.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_with_tabs=true|align_with_tabs=false
+ValueDefault=false
+
+[Align On Tabstop]
+Category=7
+Description="<html>Whether to bump out to the next tab when aligning.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_on_tabstop=true|align_on_tabstop=false
+ValueDefault=false
+
+[Align Number Right]
+Category=7
+Description="<html>Whether to right-align numbers.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_number_right=true|align_number_right=false
+ValueDefault=false
+
+[Align Keep Extra Space]
+Category=7
+Description="<html>Whether to keep whitespace not required for alignment.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_keep_extra_space=true|align_keep_extra_space=false
+ValueDefault=false
+
+[Align Func Params]
+Category=7
+Description="<html>Whether to align variable definitions in prototypes and functions.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_func_params=true|align_func_params=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_func_params_span="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Func Params Thresh]
+Category=7
+Description="<html>The threshold for aligning function parameter definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_func_params_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Func Params Gap]
+Category=7
+Description="<html>The gap for aligning function parameter definitions.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_func_params_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Constr Value Span]
+Category=7
+Description="<html>The span for aligning constructor value.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_constr_value_span="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Constr Value Thresh]
+Category=7
+Description="<html>The threshold for aligning constructor value.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_constr_value_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Constr Value Gap]
+Category=7
+Description="<html>The gap for aligning constructor value.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_constr_value_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_same_func_call_params=true|align_same_func_call_params=false
+ValueDefault=false
+
+[Align Same Func Call Params Span]
+Category=7
+Description="<html>The span for aligning function-call parameters for single line functions.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_same_func_call_params_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Same Func Call Params Thresh]
+Category=7
+Description="<html>The threshold for aligning function-call parameters for single line<br/>functions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_same_func_call_params_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Def Span]
+Category=7
+Description="<html>The span for aligning variable definitions.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_def_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Def Star Style]
+Category=7
+Description="<html>How to consider (or treat) the '*' in the alignment of 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;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_def_star_style="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[Align Var Def Amp Style]
+Category=7
+Description="<html>How to consider (or treat) the '&amp;' in the alignment of 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;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_def_amp_style="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[Align Var Def Thresh]
+Category=7
+Description="<html>The threshold for aligning variable definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_def_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Def Gap]
+Category=7
+Description="<html>The gap for aligning variable definitions.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_def_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Var Def Colon]
+Category=7
+Description="<html>Whether to align the colon in struct bit fields.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_var_def_colon=true|align_var_def_colon=false
+ValueDefault=false
+
+[Align Var Def Colon Gap]
+Category=7
+Description="<html>The gap for aligning the colon in struct bit fields.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_def_colon_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Var Def Attribute]
+Category=7
+Description="<html>Whether to align any attribute after the variable name.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_var_def_attribute=true|align_var_def_attribute=false
+ValueDefault=false
+
+[Align Var Def Inline]
+Category=7
+Description="<html>Whether to align inline struct/enum/union variable definitions.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_var_def_inline=true|align_var_def_inline=false
+ValueDefault=false
+
+[Align Assign Span]
+Category=7
+Description="<html>The span for aligning on '=' in assignments.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_assign_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Assign Func Proto Span]
+Category=7
+Description="<html>The span for aligning on '=' in function prototype modifier.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_assign_func_proto_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Assign Thresh]
+Category=7
+Description="<html>The threshold for aligning on '=' in assignments.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_assign_thresh="
+MinVal=-1000
+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>"
+Enabled=false
+EditorType=numeric
+CallName="align_enum_equ_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Enum Equ Thresh]
+Category=7
+Description="<html>The threshold for aligning on '=' in enums.<br/>Use a negative number for absolute thresholds.<br/><br/>0: no limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_enum_equ_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Class Span]
+Category=7
+Description="<html>The span for aligning class member definitions.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_class_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Class Thresh]
+Category=7
+Description="<html>The threshold for aligning class member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_class_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Class Gap]
+Category=7
+Description="<html>The gap for aligning class member definitions.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_class_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Var Struct Span]
+Category=7
+Description="<html>The span for aligning struct/union member definitions.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_struct_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Struct Thresh]
+Category=7
+Description="<html>The threshold for aligning struct/union member definitions.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_struct_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Var Struct Gap]
+Category=7
+Description="<html>The gap for aligning struct/union member definitions.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_var_struct_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Struct Init Span]
+Category=7
+Description="<html>The span for aligning struct initializer values.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_struct_init_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Typedef Span]
+Category=7
+Description="<html>The span for aligning single-line typedefs.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_typedef_span="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align Typedef Gap]
+Category=7
+Description="<html>The minimum space between the type and the synonym of a typedef.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_typedef_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_typedef_func="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[Align Typedef Star Style]
+Category=7
+Description="<html>How to consider (or treat) the '*' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int * pint;' (default)<br/>1: Part of type name:        'typedef int   *pint;'<br/>2: Dangling:                 'typedef int  *pint;'<br/>Dangling: the '*' will not be taken into account when aligning.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_typedef_star_style="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[Align Typedef Amp Style]
+Category=7
+Description="<html>How to consider (or treat) the '&amp;' in the alignment of typedefs.<br/><br/>0: Part of the typedef type, 'typedef int &amp; intref;' (default)<br/>1: Part of type name:        'typedef int   &amp;intref;'<br/>2: Dangling:                 'typedef int  &amp;intref;'<br/>Dangling: the '&amp;' will not be taken into account when aligning.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_typedef_amp_style="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[Align Right Cmt Span]
+Category=7
+Description="<html>The span for aligning comments that end lines.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_right_cmt_span="
+MinVal=0
+MaxVal=5000
+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>"
+Enabled=false
+EditorType=numeric
+CallName="align_right_cmt_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+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
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_right_cmt_at_col="
+MinVal=0
+MaxVal=200
+ValueDefault=0
+
+[Align Func Proto Span]
+Category=7
+Description="<html>The span for aligning function prototypes.<br/><br/>0: Don't align (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_func_proto_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Func Proto Thresh]
+Category=7
+Description="<html>The threshold for aligning function prototypes.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_func_proto_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
+[Align Func Proto Gap]
+Category=7
+Description="<html>Minimum gap between the return type and the function name.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_func_proto_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Align On Operator]
+Category=7
+Description="<html>Whether to align function prototypes on the 'operator' keyword instead of<br/>what follows.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_on_operator=true|align_on_operator=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_mix_var_proto=true|align_mix_var_proto=false
+ValueDefault=false
+
+[Align Single Line Func]
+Category=7
+Description="<html>Whether to align single-line functions with function prototypes.<br/>Uses align_func_proto_span.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_single_line_func=true|align_single_line_func=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_single_line_brace=true|align_single_line_brace=false
+ValueDefault=false
+
+[Align Single Line Brace Gap]
+Category=7
+Description="<html>Gap for align_single_line_brace.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_single_line_brace_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_oc_msg_spec_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_nl_cont=true|align_nl_cont=false
+ValueDefault=false
+
+[Align Pp Define Together]
+Category=7
+Description="<html>Whether to align macro functions and variables together.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_pp_define_together=true|align_pp_define_together=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_pp_define_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[Align Pp Define Gap]
+Category=7
+Description="<html>The minimum space between label and value of a preprocessor define.</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_pp_define_gap="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_left_shift=true|align_left_shift=false
+ValueDefault=true
+
+[Align Eigen Comma Init]
+Category=7
+Description="<html>Whether to align comma-separated statements following '&lt;&lt;' (as used to<br/>initialize Eigen matrices).</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_eigen_comma_init=true|align_eigen_comma_init=false
+ValueDefault=false
+
+[Align Asm Colon]
+Category=7
+Description="<html>Whether to align text after 'asm volatile ()' colons.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_asm_colon=true|align_asm_colon=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_oc_msg_colon_span="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_oc_msg_colon_first=true|align_oc_msg_colon_first=false
+ValueDefault=false
+
+[Align Oc Decl Colon]
+Category=7
+Description="<html>(OC) Whether to align parameters in an Objective-C '+' or '-' declaration<br/>on the ':'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_oc_decl_colon=true|align_oc_decl_colon=false
+ValueDefault=false
+
+[Align Oc Msg Colon Xcode Like]
+Category=7
+Description="<html>(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>aligment)</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
+ValueDefault=false
+
+[Cmt Width]
+Category=8
+Description="<html>Try to wrap comments at N columns.</html>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_width="
+MinVal=0
+MaxVal=256
+ValueDefault=0
+
+[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 (enable cmt_indent_multi for indent with line wrapping due to cmt_width)</html>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_reflow_mode="
+MinVal=0
+MaxVal=2
+ValueDefault=0
+
+[Cmt Reflow Fold Regex File]
+Category=8
+Description="<html>Path to a file that contains regular expressions describing patterns for<br/>which the end of one line and the beginning of the next will be folded into<br/>the same sentence or paragraph during full comment reflow. The regular<br/>expressions are described using ECMAScript syntax. The syntax for this<br/>specification is as follows, where "..." indicates the custom regular<br/>expression and "n" indicates the nth end_of_prev_line_regex and<br/>beg_of_next_line_regex regular expression pair:<br/><br/>end_of_prev_line_regex[1] = "...$"<br/>beg_of_next_line_regex[1] = "^..."<br/>end_of_prev_line_regex[2] = "...$"<br/>beg_of_next_line_regex[2] = "^..."<br/>            .<br/>            .<br/>            .<br/>end_of_prev_line_regex[n] = "...$"<br/>beg_of_next_line_regex[n] = "^..."<br/><br/>Note that use of this option overrides the default reflow fold regular<br/>expressions, which are internally defined as follows:<br/><br/>end_of_prev_line_regex[1] = "[\w,\]\)]$"<br/>beg_of_next_line_regex[1] = "^[\w,\[\(]"<br/>end_of_prev_line_regex[2] = "\.$"<br/>beg_of_next_line_regex[2] = "^[A-Z]"</html>"
+Enabled=false
+CallName=cmt_reflow_fold_regex_file=
+EditorType=string
+ValueDefault=
+
+[Cmt Reflow Indent To Paragraph Start]
+Category=8
+Description="<html>Whether to indent wrapped lines to the start of the encompassing paragraph<br/>during full comment reflow (cmt_reflow_mode = 2). Overrides the value<br/>specified by cmt_sp_after_star_cont.<br/><br/>Note that cmt_align_doxygen_javadoc_tags overrides this option for<br/>paragraphs associated with javadoc tags</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_reflow_indent_to_paragraph_start=true|cmt_reflow_indent_to_paragraph_start=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_convert_tab_to_spaces=true|cmt_convert_tab_to_spaces=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false
+ValueDefault=true
+
+[Cmt Align Doxygen Javadoc Tags]
+Category=8
+Description="<html>Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)<br/>and corresponding fields such that groups of consecutive block tags,<br/>parameter names, and descriptions align with one another. Overrides that<br/>which is specified by the cmt_sp_after_star_cont. If cmt_width &gt; 0, it may<br/>be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2<br/>in order to achieve the desired alignment for line-wrapping.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_align_doxygen_javadoc_tags=true|cmt_align_doxygen_javadoc_tags=false
+ValueDefault=false
+
+[Cmt Sp Before Doxygen Javadoc Tags]
+Category=8
+Description="<html>The number of spaces to insert after the star and before doxygen<br/>javadoc-style tags (@param, @return, etc). Requires enabling<br/>cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the<br/>cmt_sp_after_star_cont.<br/><br/>Default: 1</html>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_sp_before_doxygen_javadoc_tags="
+MinVal=0
+MaxVal=16
+ValueDefault=1
+
+[Cmt C Group]
+Category=8
+Description="<html>Whether to group c-comments that look like they are in a block.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_c_group=true|cmt_c_group=false
+ValueDefault=false
+
+[Cmt C Nl Start]
+Category=8
+Description="<html>Whether to put an empty '/*' on the first line of the combined c-comment.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_c_nl_start=true|cmt_c_nl_start=false
+ValueDefault=false
+
+[Cmt C Nl End]
+Category=8
+Description="<html>Whether to add 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
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_cpp_group=true|cmt_cpp_group=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_cpp_nl_start=true|cmt_cpp_nl_start=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_cpp_nl_end=true|cmt_cpp_nl_end=false
+ValueDefault=false
+
+[Cmt Star Cont]
+Category=8
+Description="<html>Whether to put a star on subsequent comment lines.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_star_cont=true|cmt_star_cont=false
+ValueDefault=false
+
+[Cmt Sp Before Star Cont]
+Category=8
+Description="<html>The number of spaces to insert at the start of subsequent comment lines.</html>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_sp_before_star_cont="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Cmt Sp After Star Cont]
+Category=8
+Description="<html>The number of spaces to insert after the star on subsequent comment lines.</html>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_sp_after_star_cont="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_multi_check_last=true|cmt_multi_check_last=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_multi_first_len_minimum="
+MinVal=1
+MaxVal=20
+ValueDefault=4
+
+[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>"
+Enabled=false
+CallName=cmt_insert_file_header=
+EditorType=string
+ValueDefault=
+
+[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>"
+Enabled=false
+CallName=cmt_insert_file_footer=
+EditorType=string
+ValueDefault=
+
+[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>"
+Enabled=false
+CallName=cmt_insert_func_header=
+EditorType=string
+ValueDefault=
+
+[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>"
+Enabled=false
+CallName=cmt_insert_class_header=
+EditorType=string
+ValueDefault=
+
+[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>"
+Enabled=false
+CallName=cmt_insert_oc_msg_header=
+EditorType=string
+ValueDefault=
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_insert_before_preproc=true|cmt_insert_before_preproc=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_insert_before_inlines=true|cmt_insert_before_inlines=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_insert_before_ctor_dtor=true|cmt_insert_before_ctor_dtor=false
+ValueDefault=false
+
+[Mod Full Brace Do]
+Category=9
+Description="<html>Add or remove braces on a 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|mod_full_brace_do=not_defined
+ChoicesReadable="Ignore Mod Full Brace Do|Add Mod Full Brace Do|Remove Mod Full Brace Do|Force Mod Full Brace Do"
+ValueDefault=ignore
+
+[Mod Full Brace For]
+Category=9
+Description="<html>Add or remove braces on a 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|mod_full_brace_for=not_defined
+ChoicesReadable="Ignore Mod Full Brace For|Add Mod Full Brace For|Remove Mod Full Brace For|Force Mod Full Brace For"
+ValueDefault=ignore
+
+[Mod Full Brace Function]
+Category=9
+Description="<html>(Pawn) Add or remove braces on a single-line function definition.</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|mod_full_brace_function=not_defined
+ChoicesReadable="Ignore Mod Full Brace Function|Add Mod Full Brace Function|Remove Mod Full Brace Function|Force Mod Full Brace Function"
+ValueDefault=ignore
+
+[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>"
+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|mod_full_brace_if=not_defined
+ChoicesReadable="Ignore Mod Full Brace If|Add Mod Full Brace If|Remove Mod Full Brace If|Force Mod Full Brace If"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
+ValueDefault=false
+
+[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>"
+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|mod_full_brace_while=not_defined
+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|mod_full_brace_using=not_defined
+ChoicesReadable="Ignore Mod Full Brace Using|Add Mod Full Brace Using|Remove Mod Full Brace Using|Force Mod Full Brace Using"
+ValueDefault=ignore
+
+[Mod Full Brace Nl]
+Category=9
+Description="<html>Don't remove braces around statements that span N newlines</html>"
+Enabled=false
+EditorType=numeric
+CallName="mod_full_brace_nl="
+MinVal=0
+MaxVal=5000
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_brace_nl_block_rem_mlcond=true|mod_full_brace_nl_block_rem_mlcond=false
+ValueDefault=false
+
+[Mod Paren On Return]
+Category=9
+Description="<html>Add or remove unnecessary parenthesis 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|mod_paren_on_return=not_defined
+ChoicesReadable="Ignore Mod Paren On Return|Add Mod Paren On Return|Remove Mod Paren On Return|Force Mod Paren On Return"
+ValueDefault=ignore
+
+[Mod Pawn Semicolon]
+Category=9
+Description="<html>(Pawn) Whether to change optional semicolons to real semicolons.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_pawn_semicolon=true|mod_pawn_semicolon=false
+ValueDefault=false
+
+[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)' =&gt; 'if (a &amp;&amp; (b &gt; c))'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false
+ValueDefault=false
+
+[Mod Remove Extra Semicolon]
+Category=9
+Description="<html>Whether to remove superfluous semicolons.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_remove_extra_semicolon=true|mod_remove_extra_semicolon=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_add_long_function_closebrace_comment="
+MinVal=0
+MaxVal=255
+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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_add_long_namespace_closebrace_comment="
+MinVal=0
+MaxVal=255
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_add_long_class_closebrace_comment="
+MinVal=0
+MaxVal=255
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_add_long_switch_closebrace_comment="
+MinVal=0
+MaxVal=255
+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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_add_long_ifdef_endif_comment="
+MinVal=0
+MaxVal=255
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_add_long_ifdef_else_comment="
+MinVal=0
+MaxVal=255
+ValueDefault=0
+
+[Mod Sort Case Sensitive]
+Category=9
+Description="<html>Whether to take care of the case by the mod_sort_xx options.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_case_sensitive=true|mod_sort_case_sensitive=false
+ValueDefault=false
+
+[Mod Sort Import]
+Category=9
+Description="<html>Whether to sort consecutive single-line 'import' statements.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_import=true|mod_sort_import=false
+ValueDefault=false
+
+[Mod Sort Using]
+Category=9
+Description="<html>(C#) Whether to sort consecutive single-line 'using' statements.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_using=true|mod_sort_using=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_include=true|mod_sort_include=false
+ValueDefault=false
+
+[Mod Sort Incl Import Prioritize Filename]
+Category=9
+Description="<html>Whether to prioritize '#include' and '#import' statements that contain<br/>filename without extension when sorting is enabled.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_incl_import_prioritize_filename=true|mod_sort_incl_import_prioritize_filename=false
+ValueDefault=false
+
+[Mod Sort Incl Import Prioritize Extensionless]
+Category=9
+Description="<html>Whether to prioritize '#include' and '#import' statements that does not<br/>contain extensions when sorting is enabled.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_incl_import_prioritize_extensionless=true|mod_sort_incl_import_prioritize_extensionless=false
+ValueDefault=false
+
+[Mod Sort Incl Import Prioritize Angle Over Quotes]
+Category=9
+Description="<html>Whether to prioritize '#include' and '#import' statements that contain<br/>angle over quotes when sorting is enabled.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_incl_import_prioritize_angle_over_quotes=true|mod_sort_incl_import_prioritize_angle_over_quotes=false
+ValueDefault=false
+
+[Mod Sort Incl Import Ignore Extension]
+Category=9
+Description="<html>Whether to ignore file extension in '#include' and '#import' statements<br/>for sorting comparison.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_incl_import_ignore_extension=true|mod_sort_incl_import_ignore_extension=false
+ValueDefault=false
+
+[Mod Sort Incl Import Grouping Enabled]
+Category=9
+Description="<html>Whether to group '#include' and '#import' statements when sorting is enabled.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_incl_import_grouping_enabled=true|mod_sort_incl_import_grouping_enabled=false
+ValueDefault=false
+
+[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;' =&gt; 'case X: { ... break; }'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_move_case_break=true|mod_move_case_break=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=multiple
+Choices=mod_case_brace=ignore|mod_case_brace=add|mod_case_brace=remove|mod_case_brace=force|mod_case_brace=not_defined
+ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
+ValueDefault=ignore
+
+[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>"
+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|mod_enum_last_comma=not_defined
+ChoicesReadable="Ignore Mod Enum Last Comma|Add Mod Enum Last Comma|Remove Mod Enum Last Comma|Force Mod Enum Last Comma"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_sort_oc_properties=true|mod_sort_oc_properties=false
+ValueDefault=false
+
+[Mod Sort Oc Property Class Weight]
+Category=9
+Description="<html>(OC) Weight of a class property modifier.</html>"
+Enabled=false
+EditorType=numeric
+CallName="mod_sort_oc_property_class_weight="
+MinVal=
+MaxVal=
+ValueDefault=0
+
+[Mod Sort Oc Property Thread Safe Weight]
+Category=9
+Description="<html>(OC) Weight of 'atomic' and 'nonatomic'.</html>"
+Enabled=false
+EditorType=numeric
+CallName="mod_sort_oc_property_thread_safe_weight="
+MinVal=
+MaxVal=
+ValueDefault=0
+
+[Mod Sort Oc Property Readwrite Weight]
+Category=9
+Description="<html>(OC) Weight of 'readwrite' when organizing properties.</html>"
+Enabled=false
+EditorType=numeric
+CallName="mod_sort_oc_property_readwrite_weight="
+MinVal=
+MaxVal=
+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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_sort_oc_property_reference_weight="
+MinVal=
+MaxVal=
+ValueDefault=0
+
+[Mod Sort Oc Property Getter Weight]
+Category=9
+Description="<html>(OC) Weight of getter type ('getter=') when organizing properties.</html>"
+Enabled=false
+EditorType=numeric
+CallName="mod_sort_oc_property_getter_weight="
+MinVal=
+MaxVal=
+ValueDefault=0
+
+[Mod Sort Oc Property Setter Weight]
+Category=9
+Description="<html>(OC) Weight of setter type ('setter=') when organizing properties.</html>"
+Enabled=false
+EditorType=numeric
+CallName="mod_sort_oc_property_setter_weight="
+MinVal=
+MaxVal=
+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>"
+Enabled=false
+EditorType=numeric
+CallName="mod_sort_oc_property_nullability_weight="
+MinVal=
+MaxVal=
+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>"
+Enabled=false
+EditorType=multiple
+Choices=pp_indent=ignore|pp_indent=add|pp_indent=remove|pp_indent=force|pp_indent=not_defined
+ChoicesReadable="Ignore Pp Indent|Add Pp Indent|Remove Pp Indent|Force Pp Indent"
+ValueDefault=ignore
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="pp_indent_count="
+MinVal=0
+MaxVal=16
+ValueDefault=1
+
+[Pp Space]
+Category=10
+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|pp_space=not_defined
+ChoicesReadable="Ignore Pp Space|Add Pp Space|Remove Pp Space|Force Pp Space"
+ValueDefault=ignore
+
+[Pp Space Count]
+Category=10
+Description="<html>Sets the number of spaces per level added with pp_space.</html>"
+Enabled=false
+EditorType=numeric
+CallName="pp_space_count="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="pp_indent_region="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
+[Pp Region Indent Code]
+Category=10
+Description="<html>Whether to indent the code between #region and #endregion.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_region_indent_code=true|pp_region_indent_code=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="pp_indent_if="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
+[Pp If Indent Code]
+Category=10
+Description="<html>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
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_define_at_level=true|pp_define_at_level=false
+ValueDefault=false
+
+[Pp Ignore Define Body]
+Category=10
+Description="<html>Whether to ignore the '#define' body while formatting.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_ignore_define_body=true|pp_ignore_define_body=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_indent_case=true|pp_indent_case=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_indent_func_def=true|pp_indent_func_def=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_indent_extern=true|pp_indent_extern=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_indent_brace=true|pp_indent_brace=false
+ValueDefault=true
+
+[Include Category 0]
+Category=11
+Description="<html>The regex for include category with priority 0.</html>"
+Enabled=false
+CallName=include_category_0=
+EditorType=string
+ValueDefault=
+
+[Include Category 1]
+Category=11
+Description="<html>The regex for include category with priority 1.</html>"
+Enabled=false
+CallName=include_category_1=
+EditorType=string
+ValueDefault=
+
+[Include Category 2]
+Category=11
+Description="<html>The regex for include category with priority 2.</html>"
+Enabled=false
+CallName=include_category_2=
+EditorType=string
+ValueDefault=
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=use_indent_func_call_param=true|use_indent_func_call_param=false
+ValueDefault=true
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
+ValueDefault=false
+
+[Use Sp After Angle Always]
+Category=12
+Description="<html>Whether sp_after_angle takes precedence over sp_inside_fparen. This was the<br/>historic behavior, but is probably not the desired behavior, so this is off<br/>by default.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=use_sp_after_angle_always=true|use_sp_after_angle_always=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=boolean
+TrueFalse=use_options_overriding_for_qt_macros=true|use_options_overriding_for_qt_macros=false
+ValueDefault=true
+
+[Use Form Feed No More As Whitespace Character]
+Category=12
+Description="<html>If true: the form feed character is removed from the list of whitespace<br/>characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=use_form_feed_no_more_as_whitespace_character=true|use_form_feed_no_more_as_whitespace_character=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="warn_level_tabs_found_in_verbatim_string_literals="
+MinVal=1
+MaxVal=3
+ValueDefault=2
+
+[Debug Max Number Of Loops]
+Category=13
+Description="<html>Limit the number of loops.<br/>Used by uncrustify.cpp to exit from infinite loop.<br/>0: no limit.</html>"
+Enabled=false
+EditorType=numeric
+CallName="debug_max_number_of_loops="
+MinVal=
+MaxVal=
+ValueDefault=0
+
+[Debug Line Number To Protocol]
+Category=13
+Description="<html>Set the number of the line to protocol;<br/>Used in the function prot_the_line if the 2. parameter is zero.<br/>0: nothing protocol.</html>"
+Enabled=false
+EditorType=numeric
+CallName="debug_line_number_to_protocol="
+MinVal=
+MaxVal=
+ValueDefault=0
+
+[Debug Timeout]
+Category=13
+Description="<html>Set the number of second(s) before terminating formatting the current file,<br/>0: no timeout.<br/>only for linux</html>"
+Enabled=false
+EditorType=numeric
+CallName="debug_timeout="
+MinVal=
+MaxVal=
+ValueDefault=0
+
+[Debug Truncate]
+Category=13
+Description="<html>Set the number of characters to be printed if the text is too long,<br/>0: do not truncate.</html>"
+Enabled=false
+EditorType=numeric
+CallName="debug_truncate="
+MinVal=0
+MaxVal=960
+ValueDefault=0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/uncrust-files.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrust-files.sh
index 3e1d09b3..3e1d09b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/uncrust-files.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrust-files.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/uncrustify.xml.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrustify.xml.in
index 33f6c6a5..33f6c6a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/uncrustify.xml.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/uncrustify.xml.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/xsupplicant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/xsupplicant.cfg
index 45d16fa6..45d16fa6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/etc/xsupplicant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/etc/xsupplicant.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/extras.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/extras.vpj
index 4b57772a..4b57772a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/extras.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/extras.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/forUncrustifySources.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.cfg
index 9389f055..9389f055 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/forUncrustifySources.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/forUncrustifySources.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.txt
index 5beb747f..5beb747f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/forUncrustifySources.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/forUncrustifySources.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/ChunkStack.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/ChunkStack.lnt
index cea5860f..cea5860f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/ChunkStack.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/ChunkStack.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/align.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/align.lnt
index 32e388c3..32e388c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/align.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/align.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/chunk_list.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/chunk_list.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/chunk_list.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/chunk_list.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/logger.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/logger.lnt
index e41a1282..e41a1282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/logger.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/logger.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/readme.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/readme.txt
index f2534349..f2534349 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/readme.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/readme.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/unc_text.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/unc_text.lnt
index 89cb4fdb..89cb4fdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/unc_text.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/unc_text.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/uncrustify_types.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/uncrustify_types.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/lnt/uncrustify_types.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/lnt/uncrustify_types.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/man/uncrustify.1.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/man/uncrustify.1.in
index eea3ca37..eea3ca37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/man/uncrustify.1.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/man/uncrustify.1.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/osx/Xcode Organizer Actions.xccommands b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/osx/Xcode Organizer Actions.xccommands
index be727021..be727021 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/osx/Xcode Organizer Actions.xccommands
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/osx/Xcode Organizer Actions.xccommands
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/package.json b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/package.json
index 9a8147c4..39d108a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/package.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uncrustify",
-  "version": "0.72.0",
+  "version": "0.73.0",
   "description": "A highly configurable, easily modifiable source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA",
   "main": "uncrustify",
   "scripts": {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/release-process.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/release-process.rst
index f5d4cba8..4fa9e043 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/release-process.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/release-process.rst
@@ -4,7 +4,7 @@
 
 .. Update the date in the next line when editing this document!
 
-*This document was last updated on 2020-11-05, for Uncrustify 0.72.0.*
+*This document was last updated on 2021-05-12, for Uncrustify 0.73.0.*
 
 This document uses "0.1.2" throughout as an example version number.
 Whenever you see this, you should substitute the version number
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/Gcov_test.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Gcov_test.sh
index a3853773..a3853773 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/Gcov_test.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Gcov_test.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/Run_clang-tidy.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Run_clang-tidy.sh
index c2f1c150..c2f1c150 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/Run_clang-tidy.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/Run_clang-tidy.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/add_test_list.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/add_test_list.awk
index 1fbe2840..1fbe2840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/add_test_list.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/add_test_list.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/check_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/check_options.py
index 1d32224b..1d32224b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/check_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/check_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/cmpcfg.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/cmpcfg.pl
index df119dc1..df119dc1 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/cmpcfg.pl
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/cmpcfg.pl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/compare_the_gcov.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/compare_the_gcov.awk
index 30dba1ad..30dba1ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/compare_the_gcov.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/compare_the_gcov.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/gen_changelog.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_changelog.py
index 8e042385..8e042385 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/gen_changelog.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_changelog.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/gen_config_combinations_uniq_output.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output.py
index 2fa4fb0c..2fa4fb0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/gen_config_combinations_uniq_output.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/gen_config_combinations_uniq_output_example.json b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output_example.json
index 315fdfef..315fdfef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/gen_config_combinations_uniq_output_example.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/gen_config_combinations_uniq_output_example.json
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/grammar_permutator.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/grammar_permutator.py
index cd42bd9f..cd42bd9f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/grammar_permutator.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/grammar_permutator.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_katehl.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_katehl.py
index e241986a..e241986a 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_katehl.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_katehl.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_option_enum.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_option_enum.py
index c141bb04..c141bb04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_option_enum.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_option_enum.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_options.py
index 71e97115..71e97115 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_punctuator_table.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_punctuator_table.py
index f3d90081..f3d90081 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_punctuator_table.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_punctuator_table.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_version.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_version.py
index 14e20018..14e20018 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/make_version.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/make_version.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/option_reducer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/option_reducer.py
index 403ff92b..403ff92b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/option_reducer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/option_reducer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/au-sm123.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/au-sm123.lnt
index 6eaf9a6b..6eaf9a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/au-sm123.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/au-sm123.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/co-gcc.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.h
index e948a20f..e948a20f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/co-gcc.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/co-gcc.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.lnt
index f7bd38dd..f7bd38dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/co-gcc.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/co-gcc.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/lint_cfg.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/lint_cfg.lnt
index 72530d53..72530d53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/lint_cfg.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/lint_cfg.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/pclint_cfg_eclipse.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/pclint_cfg_eclipse.lnt
index d1945c5b..d1945c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/pclint_cfg_eclipse.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/pclint_cfg_eclipse.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/policy.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/policy.lnt
index 911e74b7..911e74b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/policy.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/policy.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/run-pclint-eclipse.bat b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/run-pclint-eclipse.bat
index 1a778bfa..1a778bfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/run-pclint-eclipse.bat
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/run-pclint-eclipse.bat
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/usage.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/usage.txt
index fff1c305..fff1c305 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/pclint/usage.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/pclint/usage.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/prepare_list_of_authors.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/prepare_list_of_authors.sh
index 6485d377..6485d377 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/prepare_list_of_authors.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/prepare_list_of_authors.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/release_tool.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/release_tool.py
index 2dd71676..2dd71676 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/release_tool.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/release_tool.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/run_ctest.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/run_ctest.py
index 0267e0ad..0267e0ad 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/run_ctest.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/run_ctest.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/tokenizer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/tokenizer.py
index 0bc33bac..0bc33bac 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/tokenizer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/tokenizer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/update_emscripten_bindings.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/update_emscripten_bindings.py
index d44a58a6..d44a58a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/scripts/update_emscripten_bindings.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/scripts/update_emscripten_bindings.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/.kateconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/.kateconfig
index 4d9024f0..4d9024f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/.kateconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/.kateconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ChunkStack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.cpp
index 9f5ab7b4..c04c6e5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ChunkStack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.cpp
@@ -5,9 +5,8 @@
  * @author  Ben Gardner
  * @license GPL v2+
  */
+
 #include "ChunkStack.h"
-#include <cstdio>
-#include <cstdlib>
 
 
 void ChunkStack::Set(const ChunkStack &cs)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ChunkStack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.h
index 75f72ff4..8434d895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ChunkStack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ChunkStack.h
@@ -9,7 +9,6 @@
 #define CHUNKSTACK_H_INCLUDED
 
 #include "uncrustify_types.h"
-#include <deque>
 
 class ChunkStack
 {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.cpp
new file mode 100644
index 00000000..48e1911d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.cpp
@@ -0,0 +1,2858 @@
+/**
+ * @file EnumStructUnionParser.cpp
+ *
+ * @author
+ * @license GPL v2+
+ */
+
+#include "EnumStructUnionParser.h"
+
+#include "combine_fix_mark.h"
+#include "combine_skip.h"
+#include "combine_tools.h"
+#include "flag_parens.h"
+#include "lang_pawn.h"
+
+
+/**
+ * Extern declarations
+ */
+extern const char *get_token_name(c_token_t);
+extern void log_pcf_flags(log_sev_t, pcf_flags_t);
+
+
+/**
+ * Forward declarations
+ */
+static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *, std::size_t);
+static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *, std::size_t);
+static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *);
+static chunk_t *skip_scope_resolution_and_nested_name_specifiers_rev(chunk_t *);
+
+
+/**
+ * Returns true if two adjacent chunks potentially match a pattern consistent
+ * with that of a qualified identifier
+ */
+static bool adj_tokens_match_qualified_identifier_pattern(chunk_t *prev, chunk_t *next)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  prev != nullptr
+      && next != nullptr)
+   {
+      auto prev_token_type = prev->type;
+      auto next_token_type = next->type;
+
+      switch (prev_token_type)
+      {
+      case CT_ANGLE_CLOSE:
+         /**
+          * assuming the previous token is possibly the closing angle of a
+          * templated type, the next token may be a scope resolution operator ("::")
+          */
+         return(next_token_type == CT_DC_MEMBER);
+
+      case CT_ANGLE_OPEN:
+         /**
+          * assuming the previous token is possibly the opening angle of a
+          * templated type, just check to see if there's a matching closing
+          * angle
+          */
+         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
+
+      case CT_DC_MEMBER:
+         /**
+          * if the previous token is a double colon ("::"), it is likely part
+          * of a chain of scope-resolution qualifications preceding a word or
+          * type
+          */
+         return(  next_token_type == CT_TYPE
+               || next_token_type == CT_WORD);
+
+      case CT_TYPE:
+      case CT_WORD:
+         /**
+          * if the previous token is an identifier, the next token may be
+          * one of the following:
+          * - an opening angle, which may indicate a templated type as part of a
+          *   scope resolution preceding the actual variable identifier
+          * - a double colon ("::")
+          */
+         return(  next_token_type == CT_ANGLE_OPEN
+               || next_token_type == CT_DC_MEMBER);
+
+      default:
+         // do nothing
+         break;
+      } // switch
+   }
+   return(false);
+} // adj_tokens_match_qualified_identifier_pattern
+
+
+/**
+ * Returns true if two adjacent chunks potentially match a pattern consistent
+ * with that of a variable definition
+ */
+static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *next)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  prev != nullptr
+      && next != nullptr)
+   {
+      auto prev_token_type = prev->type;
+      auto next_token_type = next->type;
+
+      switch (prev_token_type)
+      {
+      case CT_ANGLE_CLOSE:
+         /**
+          * assuming the previous token is possibly the closing angle of a
+          * templated type, the next token may be one of the following:
+          * - a pointer symbol ('*', '^')
+          * - a double colon ("::")
+          * - a reference symbol ('&')
+          * - a qualifier (const, etc.)
+          * - an identifier
+          */
+         return(  chunk_is_pointer_or_reference(next)
+               || next_token_type == CT_DC_MEMBER
+               || next_token_type == CT_QUALIFIER
+               || next_token_type == CT_WORD);
+
+
+      case CT_ANGLE_OPEN:
+         /**
+          * assuming the previous token is possibly the opening angle of a
+          * templated type, just check to see if there's a matching closing
+          * angle
+          */
+         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
+
+      case CT_BRACE_CLOSE:
+         /**
+          * assuming the previous token is possibly the closing brace of a
+          * class/enum/struct/union definition, one or more inline variable
+          * definitions may follow; in that case, the next token may be one of
+          * the following:
+          * - a pointer symbol ('*', '^')
+          * - a reference symbol ('&')
+          * - a qualifier (const, etc.)
+          * - an identifier
+          */
+         return(  chunk_is_pointer_or_reference(next)
+               || next_token_type == CT_QUALIFIER
+               || next_token_type == CT_WORD);
+
+      case CT_BRACE_OPEN:
+         /**
+          * if the previous token is an opening brace, it may indicate the
+          * start of a braced initializer list - skip ahead to find a matching
+          * closing brace
+          */
+         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
+
+      case CT_BYREF:
+         /**
+          * if the previous token is a reference symbol ('&'), the next token
+          * may be an identifier
+          */
+         return(next_token_type == CT_WORD);
+
+      case CT_CARET:
+         /**
+          * if the previous token is a managed C++/CLI pointer symbol ('^'),
+          * the next token may be one of the following:
+          * - a pointer symbol ('*', '^')
+          * - a reference symbol ('&')
+          * - a qualifier (const, etc.)
+          * - an identifier
+          */
+         return(  language_is_set(LANG_CPP)
+               && (  chunk_is_pointer_or_reference(next)
+                  || next_token_type == CT_QUALIFIER
+                  || next_token_type == CT_WORD));
+
+      case CT_COMMA:
+         /**
+          * if the previous token is a comma, this may indicate a variable
+          * declaration trailing a prior declaration; in that case, the next
+          * token may be one of the following:
+          * - a pointer symbol ('*', '^')
+          * - a reference symbol ('&')
+          * - an identifier
+          */
+         return(  chunk_is_pointer_or_reference(next)
+               || next_token_type == CT_WORD);
+
+      case CT_DC_MEMBER:
+         /**
+          * if the previous token is a double colon ("::"), it is likely part
+          * of a chain of scope-resolution qualifications preceding a word or
+          * type
+          */
+         return(  next_token_type == CT_TYPE
+               || next_token_type == CT_WORD);
+
+      case CT_PAREN_OPEN:
+         /**
+          * if the previous token is an opening paren, it may indicate the
+          * start of a constructor call parameter list - skip ahead to find a
+          * matching closing paren
+          */
+         next = chunk_skip_to_match(prev, scope_e::PREPROC);
+
+         if (next != nullptr)
+         {
+            next_token_type = next->type;
+         }
+         return(next_token_type == CT_PAREN_CLOSE);
+
+      case CT_PTR_TYPE:
+         /**
+          * if the previous token is a pointer type, ('*', '^'), the next token
+          * may be one of the following:
+          * - another pointer symbol ('*', '^')
+          * - a reference symbol ('&')
+          * - a qualifier (const, etc.)
+          * - an identifier
+          */
+         return(  chunk_is_pointer_or_reference(next)
+               || next_token_type == CT_QUALIFIER
+               || next_token_type == CT_WORD);
+
+      case CT_QUALIFIER:
+         /**
+          * if the previous token is a qualifier (const, etc.), the next token
+          * may be one of the following:
+          * - a pointer symbol ('*', '^')
+          * - a reference symbol ('&')
+          * - another qualifier
+          * - an identifier
+          */
+         return(  chunk_is_pointer_or_reference(next)
+               || next_token_type == CT_QUALIFIER
+               || next_token_type == CT_WORD);
+
+      case CT_SQUARE_CLOSE:
+         /**
+          * if the previous token is a closing bracket, the next token may be
+          * an assignment following an array variable declaration
+          */
+         return(next_token_type == CT_ASSIGN);
+
+      case CT_SQUARE_OPEN:
+         /**
+          * if the previous token is an opening bracket, it may indicate an
+          * array declaration - skip ahead to find a matching closing bracket
+          */
+         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
+
+      case CT_STAR:
+         /**
+          * if the previous token is a pointer symbol, ('*'), the next token
+          * may be one of the following:
+          * - another pointer symbol ('*', '^')
+          * - a reference symbol ('&')
+          * - a qualifier (const, etc.)
+          * - an identifier
+          */
+         return(  chunk_is_pointer_or_reference(next)
+               || next_token_type == CT_QUALIFIER
+               || next_token_type == CT_WORD);
+
+      case CT_TSQUARE:
+         /**
+          * if the previous token is a set of brackets, the next token may be
+          * an assignment following an array variable declaration
+          */
+         return(next_token_type == CT_ASSIGN);
+
+      case CT_TYPE:
+         /**
+          * if the previous token is marked as a type, the next token may be
+          * one of the following:
+          * - a pointer symbol ('*', '^')
+          * - a reference symbol ('&')
+          * - an opening angle, which may indicate a templated type as part of a
+          *   scope resolution preceding the actual variable identifier
+          * - a double colon ("::")
+          * - a qualifier (const, etc.)
+          * - an identifier
+          */
+         return(  chunk_is_pointer_or_reference(next)
+               || next_token_type == CT_ANGLE_OPEN
+               || next_token_type == CT_DC_MEMBER
+               || next_token_type == CT_QUALIFIER
+               || next_token_type == CT_WORD);
+
+      case CT_WORD:
+         /**
+          * if the previous token is an identifier, the next token may be one
+          * of the following:
+          * - an assignment symbol ('=')
+          * - an opening angle, which may indicate a templated type as part of a
+          *   scope resolution preceding the actual variable identifier
+          * - an opening brace, which may indicate a braced-initializer list
+          * - a double colon ("::")
+          * - an opening paren, which may indicate a constructor call parameter
+          *   list
+          * - an opening square bracket, which may indicate an array variable
+          * - an set of empty square brackets, which also may indicate an array
+          *   variable
+          */
+         return(  next_token_type == CT_ANGLE_OPEN
+               || next_token_type == CT_ASSIGN
+               || next_token_type == CT_BRACE_OPEN
+               || next_token_type == CT_DC_MEMBER
+               || next_token_type == CT_PAREN_OPEN
+               || next_token_type == CT_SQUARE_OPEN
+               || next_token_type == CT_TSQUARE);
+
+      default:
+         // do nothing
+         break;
+      } // switch
+   }
+   return(false);
+} // adj_tokens_match_var_def_pattern
+
+
+/**
+ * Returns true if the first chunk occurs AFTER the second chunk in the argument
+ * list
+ * @param pc         points to the first chunk
+ * @param after      points to the second chunk
+ * @param test_equal if true, returns true when both chunks refer to the same chunk
+ */
+static bool chunk_is_after(chunk_t *pc, chunk_t *after, bool test_equal = true)
+{
+   LOG_FUNC_ENTRY();
+
+   if (pc != nullptr)
+   {
+      if (  test_equal
+         && pc == after)
+      {
+         return(true);
+      }
+      else if (after != nullptr)
+      {
+         auto pc_column    = pc->orig_col;
+         auto pc_line      = pc->orig_line;
+         auto after_column = after->orig_col;
+         auto after_line   = after->orig_line;
+
+         return(  pc_line > after_line
+               || (  pc_line == after_line
+                  && pc_column > after_column));
+      }
+   }
+   return(false);
+} // chunk_is_after
+
+
+/**
+ * Returns true if the first chunk occurs BEFORE the second chunk in the argument
+ * list
+ * @param pc         points to the first chunk
+ * @param before     points to the second chunk
+ * @param test_equal if true, returns true when both chunks refer to the same chunk
+ */
+static bool chunk_is_before(chunk_t *pc, chunk_t *before, bool test_equal = true)
+{
+   LOG_FUNC_ENTRY();
+
+   if (pc != nullptr)
+   {
+      if (  test_equal
+         && pc == before)
+      {
+         return(true);
+      }
+      else if (before != nullptr)
+      {
+         auto pc_column     = pc->orig_col;
+         auto pc_line       = pc->orig_line;
+         auto before_column = before->orig_col;
+         auto before_line   = before->orig_line;
+
+         return(  pc_line < before_line
+               || (  pc_line == before_line
+                  && pc_column < before_column));
+      }
+   }
+   return(false);
+} // chunk_is_before
+
+
+/**
+ * Returns true if the first chunk occurs both AFTER and BEFORE
+ * the second and third chunks, respectively, in the argument list
+ * @param pc         points to the first chunk
+ * @param after      points to the second chunk
+ * @param before     points to the third chunk
+ * @param test_equal if true, returns true when the first chunk tests equal to
+ *                   either the second or third chunk
+ */
+static bool chunk_is_between(chunk_t *pc, chunk_t *after, chunk_t *before, bool test_equal = true)
+{
+   LOG_FUNC_ENTRY();
+
+   return(  chunk_is_before(pc, before, test_equal)
+         && chunk_is_after(pc, after, test_equal));
+} // chunk_is_between
+
+
+/**
+ * Returns true if the chunk under test is a reference to a macro defined elsewhere in
+ * the source file currently being processed. Note that a macro may be defined in
+ * another source or header file, for which this function does not currently account
+ */
+static bool chunk_is_macro_reference(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   auto *next = chunk_get_head();
+
+   if (  (  language_is_set(LANG_CPP)
+         || language_is_set(LANG_C))
+      && chunk_is_token(pc, CT_WORD)
+      && !pc->flags.test(PCF_IN_PREPROC))
+   {
+      while (next != nullptr)
+      {
+         if (  next->flags.test(PCF_IN_PREPROC)
+            && std::strcmp(pc->str.c_str(), next->str.c_str()) == 0)
+         {
+            return(true);
+         }
+         next = chunk_search_next_cat(next, CT_MACRO);
+      }
+   }
+   return(false);
+} // chunk_is_macro_reference
+
+
+/**
+ * Returns true if the input chunk is a pointer/reference operator or a
+ * qualifier
+ */
+static bool chunk_is_pointer_reference_or_qualifier(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   return(  chunk_is_pointer_or_reference(pc)
+         || (  chunk_is_token(pc, CT_QUALIFIER)
+            && !chunk_is_cpp_inheritance_access_specifier(pc)));
+} // chunk_is_pointer_reference_or_qualifier
+
+
+/**
+ * This function attempts to match the starting and ending chunks of a qualified
+ * identifier, which consists of one or more scope resolution operator(s) and
+ * zero or more nested name specifiers
+ * specifiers
+ * @param pc the starting chunk
+ * @return   an std::pair, where the first chunk indicates the starting chunk of the
+ *           match and second indicates the ending chunk. Upon finding a successful
+ *           match, the starting chunk may consist of an identifier or a scope
+ *           resolution operator, while the ending chunk may consist of identifier
+ *           or the closing angle bracket of a template. If no match is found, a
+ *           pair of null chunks is returned
+ */
+static std::pair<chunk_t *, chunk_t *> match_qualified_identifier(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   auto *end   = skip_scope_resolution_and_nested_name_specifiers(pc);
+   auto *start = skip_scope_resolution_and_nested_name_specifiers_rev(pc);
+
+   if (  end != nullptr
+      && start != nullptr)
+   {
+      auto *double_colon = chunk_search_next_cat(start, CT_DC_MEMBER);
+
+      if (  double_colon != nullptr
+         && chunk_is_between(double_colon, start, end))
+      {
+         return(std::make_pair(start, end));
+      }
+   }
+   return(std::make_pair(nullptr, nullptr));
+} // match_qualified_identifier
+
+
+/**
+ * Starting from the input chunk, this function attempts to match a variable
+ * declaration/definition in both the forward and reverse directions; each pair of
+ * consecutive chunks is tested to determine if a potential match is satisfied.
+ * @param pc    the starting chunk
+ * @param level the brace level
+ * @return      upon successful match, function returns an std::tuple, where the
+ *              first chunk indicates the starting chunk, the second chunk indicates
+ *              the identifier name, and the third chunk indicates the end associated
+ *              with the variable declaration/definition
+ */
+static std::tuple<chunk_t *, chunk_t *, chunk_t *> match_variable(chunk_t *pc, std::size_t level)
+{
+   LOG_FUNC_ENTRY();
+
+   auto identifier_end_pair   = match_variable_end(pc, level);
+   auto start_identifier_pair = match_variable_start(pc, level);
+   auto *end                  = identifier_end_pair.second;
+   auto *identifier           = identifier_end_pair.first != nullptr ? identifier_end_pair.first : start_identifier_pair.second;
+   auto *start                = start_identifier_pair.first;
+
+   /**
+    * a forward search starting at the chunk under test will fail if two consecutive chunks marked as CT_WORD
+    * are encountered; in that case, it's likely that the preceding chunk indicates a type and the subsequent
+    * chunk indicates a variable declaration/definition
+    */
+
+   if (  identifier != nullptr
+      && start != nullptr
+      && (  end != nullptr
+         || chunk_is_token(chunk_get_prev_ncnnlni(identifier), CT_WORD)))
+   {
+      return(std::make_tuple(start, identifier, end));
+   }
+   return(std::make_tuple(nullptr, nullptr, nullptr));
+} // match_variable
+
+
+/**
+ * Starting from the input chunk, this function attempts to match a variable in the
+ * forward direction, and tests each pair of consecutive chunks to determine if a
+ * potential variable declaration/definition match is satisfied. Secondly, the
+ * function attempts to identify the end chunk associated with the candidate variable
+ * match. For scalar variables (simply declared and not defined), both the end chunk
+ * and identifier chunk should be one in the same
+ * @param pc    the starting chunk
+ * @param level the brace level
+ * @return      an std::pair, where the first chunk indicates the identifier
+ *              (if non-null) and the second chunk indicates the end associated with
+ *              the variable declaration/definition; assuming a valid match, the first
+ *              chunk may be null if the function is called with a starting chunk
+ *              that occurs after the identifier
+ */
+static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *pc, std::size_t level)
+{
+   LOG_FUNC_ENTRY();
+
+   chunk_t *identifier = nullptr;
+
+   while (pc != nullptr)
+   {
+      /**
+       * skip any right-hand side assignments
+       */
+      chunk_t *rhs_exp_end = nullptr;
+
+      if (chunk_is_token(pc, CT_ASSIGN))
+      {
+         /**
+          * store a pointer to the end chunk of the rhs expression;
+          * use it later to test against setting the identifier
+          */
+         rhs_exp_end = skip_to_expression_end(pc);
+         pc          = rhs_exp_end;
+      }
+
+      /**
+       * skip current and preceding chunks if at a higher brace level
+       */
+      while (  pc != nullptr
+            && pc->level > level)
+      {
+         pc = chunk_get_next_ncnnl(pc);
+      }
+
+      /**
+       * skip to any following match for angle brackets, braces, parens,
+       * or square brackets
+       */
+      if (  chunk_is_token(pc, CT_ANGLE_OPEN)
+         || chunk_is_token(pc, CT_BRACE_OPEN)
+         || chunk_is_paren_open(pc)
+         || chunk_is_token(pc, CT_SQUARE_OPEN))
+      {
+         pc = chunk_skip_to_match(pc, scope_e::PREPROC);
+      }
+      /**
+       * call a separate function to validate adjacent tokens as potentially
+       * matching a variable declaration/definition
+       */
+
+      chunk_t *next = chunk_get_next_ncnnl(pc);
+
+      if (  chunk_is_not_token(next, CT_COMMA)
+         && chunk_is_not_token(next, CT_FPAREN_CLOSE)
+         && !chunk_is_semicolon(next)
+         && !adj_tokens_match_var_def_pattern(pc, next))
+      {
+         /**
+          * error, pattern is not consistent with a variable declaration/definition
+          */
+
+         break;
+      }
+
+      if (  chunk_is_token(pc, CT_WORD)
+         && pc != rhs_exp_end)
+      {
+         /**
+          * we've encountered a candidate for the variable name
+          */
+
+         identifier = pc;
+      }
+
+      /**
+       * we're done searching if we've previously identified a variable name
+       * and then encounter a comma or semicolon
+       */
+      if (  chunk_is_token(next, CT_COMMA)
+         || chunk_is_token(next, CT_FPAREN_CLOSE)
+         || chunk_is_semicolon(next))
+      {
+         return(std::make_pair(identifier, pc));
+      }
+      pc = next;
+   }
+   return(std::make_pair(nullptr, nullptr));
+} // match_variable_end
+
+
+/**
+ * Starting from the input chunk, this function attempts to match a variable in the
+ * reverse direction, and tests each pair of consecutive chunks to determine if a
+ * potential variable declaration/definition match is satisfied. Secondly, the
+ * function attempts to identify the starting chunk associated with the candidate
+ * variable match. The start and identifier chunks may refer to each other in cases
+ * where the identifier is not preceded by pointer or reference operators or qualifiers,
+ * etc.
+ * @param pc    the starting chunk
+ * @param level the brace level
+ * @return      an std::pair, where the first chunk indicates the starting chunk and
+ *              the second chunk indicates the identifier associated with the variable
+ *              match; assuming a valid match, the second chunk may be null if the
+ *              function is called with a starting chunk that occurs before the
+ *              identifier
+ */
+static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::size_t level)
+{
+   LOG_FUNC_ENTRY();
+
+   chunk_t *identifier = nullptr;
+
+   while (pc != nullptr)
+   {
+      /**
+       * skip any right-hand side assignments
+       */
+      chunk_t *before_rhs_exp_start = skip_expression_rev(pc);
+      chunk_t *prev                 = nullptr;
+      chunk_t *next                 = pc;
+
+      while (  chunk_is_after(next, before_rhs_exp_start)
+            && pc != prev)
+      {
+         next = prev;
+         prev = chunk_get_prev_ncnnlni(next);
+
+         if (chunk_is_token(next, CT_ASSIGN))
+         {
+            pc = prev;
+         }
+      }
+      /**
+       * skip current and preceding chunks if at a higher brace level
+       */
+
+      while (  pc != nullptr
+            && pc->level > level)
+      {
+         pc = chunk_get_prev_ncnnlni(pc);
+      }
+
+      /**
+       * skip to any preceding match for angle brackets, braces, parens,
+       * or square brackets
+       */
+      if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
+         || chunk_is_token(pc, CT_BRACE_CLOSE)
+         || chunk_is_paren_close(pc)
+         || chunk_is_token(pc, CT_SQUARE_CLOSE))
+      {
+         pc = chunk_skip_to_match_rev(pc, scope_e::PREPROC);
+      }
+      /**
+       * call a separate function to validate adjacent tokens as potentially
+       * matching a variable declaration/definition
+       */
+
+      prev = chunk_get_prev_ncnnlni(pc);
+
+      if (!adj_tokens_match_var_def_pattern(prev, pc))
+      {
+         /**
+          * perhaps the previous chunk possibly indicates a type that yet to be
+          * marked? if not, then break
+          */
+         if (  chunk_is_not_token(prev, CT_WORD)
+            || (  !chunk_is_pointer_or_reference(pc)
+               && chunk_is_not_token(pc, CT_WORD)))
+         {
+            /**
+             * error, pattern is not consistent with a variable declaration/definition
+             */
+
+            break;
+         }
+      }
+
+      if (  identifier == nullptr
+         && chunk_is_token(pc, CT_WORD))
+      {
+         /**
+          * we've encountered a candidate for the variable name
+          */
+
+         identifier = pc;
+      }
+
+      /**
+       * we're done searching if we've previously identified a variable name
+       * and then encounter another identifier, or we encounter a closing
+       * brace (which would likely indicate an inline variable definition)
+       */
+      if (  chunk_is_token(prev, CT_ANGLE_CLOSE)
+         || chunk_is_token(prev, CT_BRACE_CLOSE)
+         || chunk_is_token(prev, CT_COMMA)
+         || chunk_is_token(prev, CT_TYPE)
+         || chunk_is_token(prev, CT_WORD))
+      {
+         return(std::make_pair(pc, identifier));
+      }
+      pc = prev;
+   }
+   return(std::make_pair(nullptr, nullptr));
+} // match_variable_start
+
+
+/**
+ * Skip forward past any scope resolution operators and nested name specifiers and return
+ * just the qualified identifier name; while similar to the existing skip_dc_member()
+ * function, this function also takes into account templates that may comprise any
+ * nested name specifiers
+ */
+static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  (  pc != nullptr
+         && pc->flags.test(PCF_IN_TEMPLATE))
+      || chunk_is_token(pc, CT_DC_MEMBER)
+      || chunk_is_token(pc, CT_TYPE)
+      || chunk_is_token(pc, CT_WORD))
+   {
+      while (pc != nullptr)
+      {
+         /**
+          * skip to any following match for angle brackets
+          */
+         if (chunk_is_token(pc, CT_ANGLE_OPEN))
+         {
+            pc = chunk_skip_to_match(pc, scope_e::PREPROC);
+         }
+         auto *next = chunk_get_next_ncnnl(pc);
+
+         /**
+          * call a separate function to validate adjacent tokens as potentially
+          * matching a qualified identifier
+          */
+         if (!adj_tokens_match_qualified_identifier_pattern(pc, next))
+         {
+            break;
+         }
+         pc = next;
+      }
+   }
+   return(pc);
+} // skip_scope_resolution_and_nested_name_specifiers
+
+
+/**
+ * Skip in reverse to the beginning chunk of a qualified identifier; while similar to
+ * the existing skip_dc_member_rev() function, this function also takes into account
+ * templates that may comprise any nested name specifiers
+ */
+static chunk_t *skip_scope_resolution_and_nested_name_specifiers_rev(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  (  pc != nullptr
+         && pc->flags.test(PCF_IN_TEMPLATE))
+      || chunk_is_token(pc, CT_DC_MEMBER)
+      || chunk_is_token(pc, CT_TYPE)
+      || chunk_is_token(pc, CT_WORD))
+   {
+      while (pc != nullptr)
+      {
+         /**
+          * skip to any preceding match for angle brackets
+          */
+         if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+         {
+            pc = chunk_skip_to_match_rev(pc, scope_e::PREPROC);
+         }
+         auto *prev = chunk_get_prev_ncnnlni(pc);
+
+         /**
+          * call a separate function to validate adjacent tokens as potentially
+          * matching a qualified identifier
+          */
+         if (!adj_tokens_match_qualified_identifier_pattern(prev, pc))
+         {
+            break;
+         }
+         pc = prev;
+      }
+   }
+   return(pc);
+} // skip_scope_resolution_and_nested_name_specifiers_rev
+
+
+EnumStructUnionParser::EnumStructUnionParser()
+   : m_end(nullptr)
+   , m_parse_error(false)
+   , m_start(nullptr)
+   , m_type(nullptr)
+{
+} // EnumStructUnionParser::EnumStructUnionParser
+
+
+EnumStructUnionParser::~EnumStructUnionParser()
+{
+} // EnumStructUnionParser::~EnumStructUnionParser
+
+
+void EnumStructUnionParser::analyze_identifiers()
+{
+   LOG_FUNC_ENTRY();
+
+   /**
+    * the enum (and variable declarations thereof) could be of
+    * the following forms:
+    *
+    * "enum type [: integral_type] { ... } [x, ...]"
+    * "enum type : integral_type"
+    * "enum type x, ..."
+    * "enum class type [: integral_type] { ... } [x, ...]"
+    * "enum class type [: integral_type]"
+    * "enum [: integral_type] { ... } x, ..."
+    */
+
+   /**
+    * the class/struct (and variable declarations thereof) could be of
+    * the following forms:
+    *
+    * "template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }"
+    * "template<...> class/struct[<...>] [macros/attributes ...] type"
+    * "class/struct [macros/attributes ...] type [: bases ...] { } [x, ...]"
+    * "class/struct [macros/attributes ...] type [x, ...]"
+    * "class/struct [macros/attributes ...] [: bases] { } x, ..."
+    */
+
+   chunk_t     *template_end      = get_template_end();
+   auto        *body_end          = get_body_end();
+   auto        *body_start        = get_body_start();
+   pcf_flags_t flags              = PCF_VAR_1ST_DEF;
+   auto        *inheritance_start = get_inheritance_start();
+   chunk_t     *pc                = body_end ? body_end : m_start;
+
+   /**
+    * first, try a simple approach to identify any associated type
+    */
+   if (try_pre_identify_type())
+   {
+      /**
+       * a type was identified, meaning a pair of braces, angle brackets, or
+       * a colon was found; if a colon was found, then there should be a
+       * balanced set of braces that follow; therefore, start the search for
+       * variable identifiers after the closing brace or close angle bracket
+       */
+
+      if (body_end != nullptr)
+      {
+         pc = body_end;
+      }
+      else if (template_end != nullptr)
+      {
+         pc = template_end;
+      }
+   }
+
+   if (chunk_get_next_ncnnl(pc) == m_end)
+   {
+      /**
+       * we're likely at the end of a class/enum/struct/union body which lacks
+       * any trailing inline definitions
+       */
+
+      pc = chunk_get_next_ncnnl(m_end);
+   }
+
+   if (  type_identified()
+      || chunk_is_class_enum_struct_union(pc)
+      || pc == m_end)
+   {
+      /**
+       * in case we're pointing at the end chunk, advance the chunk pointer
+       * by one more so that we don't perform a variable identifier search
+       * below
+       */
+      pc = chunk_get_next_ncnnl(pc);
+   }
+
+   if (body_end != nullptr)
+   {
+      /**
+       * a closing brace was found, so any identifiers trailing the closing
+       * brace are probably inline variable declarations following a
+       * class/enum/struct/union definition
+       */
+      flags |= PCF_VAR_INLINE;
+   }
+   else if (!type_identified())
+   {
+      /**
+       * skip any chain of one or more function-like macro calls,
+       * declspecs, and attributes
+       */
+
+      chunk_t *tmp = pc;
+
+      do
+      {
+         pc  = tmp;
+         tmp = skip_attribute_next(tmp);
+         tmp = skip_declspec_next(tmp);
+      } while (tmp != pc);
+   }
+   /**
+    * try to match some variable identifiers in the loop below
+    */
+
+   while (chunk_is_between(pc, m_start, m_end, false))
+   {
+      auto match       = match_variable(pc, m_start->level);
+      auto *start      = std::get<0>(match);
+      auto *identifier = std::get<1>(match);
+      auto *end        = std::get<2>(match);
+
+      if (  start != nullptr
+         && identifier != nullptr)
+      {
+         if (end != nullptr)
+         {
+            mark_variable(identifier, flags);
+
+            if (flags & PCF_VAR_1ST)
+            {
+               flags &= ~PCF_VAR_1ST; // clear the first flag for the next items
+            }
+         }
+      }
+
+      if (end != nullptr)
+      {
+         pc = end;
+      }
+      pc = chunk_get_next_ncnnl(pc);
+
+      /**
+       * skip any right-hand side assignments
+       */
+      if (chunk_is_token(pc, CT_ASSIGN))
+      {
+         pc = skip_to_expression_end(pc);
+      }
+
+      /**
+       * if we're sitting at a comma or semicolon, skip it
+       */
+      if (  chunk_is_semicolon(pc)
+         || (  chunk_is_token(pc, CT_COMMA)
+            && !pc->flags.test_any(PCF_IN_FCN_DEF | PCF_IN_FCN_CALL | PCF_IN_TEMPLATE)
+            && !chunk_is_between(pc, inheritance_start, body_start)))
+      {
+         pc = chunk_get_next_ncnnl(pc);
+      }
+   }
+   /**
+    * if we still haven't identified a type, try doing so now that the
+    * variables, if any, have been marked
+    */
+   try_post_identify_type();
+
+   /**
+    * identify possible macros preceding the type name
+    */
+   try_post_identify_macro_calls();
+
+   if (  chunk_is_class_or_struct(m_start)
+      && (  chunk_is_not_token(m_start, CT_STRUCT)
+         || !language_is_set(LANG_C)))
+   {
+      /**
+       * if a type has been identifies, mark any constructor matching constructor
+       * declarations/definitions
+       */
+      mark_constructors();
+   }
+
+   if (type_identified())
+   {
+      if (~flags & PCF_VAR_1ST)
+      {
+         /**
+          * PCF_VAR_1ST was cleared and a type was identified; therefore, set
+          * PCF_VAR_TYPE for the identified type
+          */
+         chunk_flags_set(m_type, PCF_VAR_TYPE);
+      }
+      else if (~flags & PCF_VAR_INLINE)
+      {
+         /**
+          * if a type was identified but no braced-enclosed body was found and no
+          * identifiers were marked as variables, then we're likely we're likely
+          * dealing with a forward declaration
+          */
+         flag_series(m_start, m_type, PCF_INCOMPLETE);
+      }
+   }
+} // EnumStructUnionParser::analyze_identifiers
+
+
+bool EnumStructUnionParser::body_detected() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto *body_end   = get_body_end();
+   auto *body_start = get_body_start();
+
+   return(  body_end != nullptr
+         && body_start != nullptr);
+} // EnumStructUnionParser::body_detected
+
+
+bool EnumStructUnionParser::comma_separated_values_detected() const
+{
+   LOG_FUNC_ENTRY();
+
+   return(!get_top_level_commas().empty());
+} // EnumStructUnionParser::comma_separated_values_detected
+
+
+bool EnumStructUnionParser::enum_base_detected() const
+{
+   LOG_FUNC_ENTRY();
+
+   return(m_chunk_map.find(CT_BIT_COLON) != m_chunk_map.cend());
+} // EnumStructUnionParser::enum_base_detected
+
+
+chunk_t *EnumStructUnionParser::get_body_end() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_BRACE_CLOSE);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_body_end
+
+
+chunk_t *EnumStructUnionParser::get_body_start() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_BRACE_OPEN);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_body_start
+
+
+chunk_t *EnumStructUnionParser::get_enum_base_start() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_BIT_COLON);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_enum_base_start
+
+
+chunk_t *EnumStructUnionParser::get_first_top_level_comma() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_COMMA);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_first_top_level_comma
+
+
+chunk_t *EnumStructUnionParser::get_inheritance_end() const
+{
+   LOG_FUNC_ENTRY();
+
+   chunk_t *brace_open        = nullptr;
+   auto    *inheritance_start = get_inheritance_start();
+
+   if (inheritance_start != nullptr)
+   {
+      brace_open = get_body_start();
+
+      if (brace_open == nullptr)
+      {
+         brace_open = chunk_get_next_type(inheritance_start,
+                                          CT_BRACE_OPEN,
+                                          m_start->level,
+                                          scope_e::ALL);
+      }
+   }
+   return(brace_open);
+} // EnumStructUnionParser::get_inheritance_end
+
+
+chunk_t *EnumStructUnionParser::get_inheritance_start() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_COLON);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_inheritance_start
+
+
+std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_question_operators() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_QUESTION);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second);
+   }
+   return(std::map<std::size_t, chunk_t *>());
+} // EnumStructUnionParser::get_question_operators
+
+
+chunk_t *EnumStructUnionParser::get_template_end() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_ANGLE_CLOSE);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_template_end
+
+
+chunk_t *EnumStructUnionParser::get_template_start() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_ANGLE_OPEN);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_template_start
+
+
+std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_top_level_commas() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_COMMA);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second);
+   }
+   return(std::map<std::size_t, chunk_t *>());
+} // EnumStructUnionParser::get_top_level_commas
+
+
+chunk_t *EnumStructUnionParser::get_where_end() const
+{
+   LOG_FUNC_ENTRY();
+
+   chunk_t *brace_open  = nullptr;
+   auto    *where_start = get_where_start();
+
+   if (where_start != nullptr)
+   {
+      brace_open = get_body_start();
+
+      if (brace_open == nullptr)
+      {
+         brace_open = chunk_get_next_type(where_start,
+                                          CT_BRACE_OPEN,
+                                          m_start->level,
+                                          scope_e::ALL);
+      }
+   }
+   return(brace_open);
+} // EnumStructUnionParser::get_where_end
+
+
+chunk_t *EnumStructUnionParser::get_where_start() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto &&it_token_chunk_map_pair = m_chunk_map.find(CT_WHERE);
+
+   if (it_token_chunk_map_pair != m_chunk_map.cend())
+   {
+      return(it_token_chunk_map_pair->second.at(0));
+   }
+   return(nullptr);
+} // EnumStructUnionParser::get_where_start
+
+
+bool EnumStructUnionParser::inheritance_detected() const
+{
+   LOG_FUNC_ENTRY();
+
+   return(m_chunk_map.find(CT_COLON) != m_chunk_map.cend());
+} // EnumStructUnionParser::inheritance_detected
+
+
+void EnumStructUnionParser::initialize(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   parse_error_detected(false);
+   m_chunk_map.clear();
+
+   m_start = pc;
+   m_type  = nullptr;
+   pc      = try_find_end_chunk(pc);
+   m_end   = refine_end_chunk(pc);
+} // EnumStructUnionParser::initialize
+
+
+bool EnumStructUnionParser::is_potential_end_chunk(chunk_t *pc) const
+{
+   LOG_FUNC_ENTRY();
+
+   /**
+    * test for a semicolon or closing brace at the level of the starting chunk
+    */
+   if (  pc == nullptr
+      || parse_error_detected()
+      || (  (  chunk_is_semicolon(pc)
+            || chunk_is_token(pc, CT_BRACE_CLOSE))
+         && pc->level == m_start->level))
+   {
+      return(true);
+   }
+   /**
+    * check for the following:
+    * 1) did we encounter a closing paren, which may indicate the end of cast?
+    * 2) did we cross a preprocessor boundary?
+    * 3) did we cross the closing paren of a function signature?
+    */
+
+   auto const pc_in_funcdef    = pc->flags & PCF_IN_FCN_DEF;
+   auto const pc_in_preproc    = pc->flags & PCF_IN_PREPROC;
+   auto const start_in_funcdef = m_start->flags & PCF_IN_FCN_DEF;
+   auto const start_in_preproc = m_start->flags & PCF_IN_PREPROC;
+
+   /**
+    * the following may identify cases where we've reached the
+    * end of a cast terminated by a closing paren
+    */
+   if (  (  chunk_is_token(pc, CT_PAREN_CLOSE)
+         && pc->level < m_start->level)
+      || (start_in_funcdef ^ pc_in_funcdef).test_any()
+      || (start_in_preproc ^ pc_in_preproc).test_any())
+   {
+      return(true);
+   }
+   /**
+    * check whether the current chunk's nest level is less than that
+    * of the starting chunk
+    */
+
+   std::size_t pc_template_nest    = get_cpp_template_angle_nest_level(pc);
+   std::size_t start_template_nest = get_cpp_template_angle_nest_level(m_start);
+
+   if (start_template_nest > pc_template_nest)
+   {
+      return(true);
+   }
+   /**
+    * assuming the chunk is within a function call/definition, check the following:
+    * 1) chunk is a closing function paren at a lower level than the starting chunk
+    * 2) chunk is an assignment ('=') or comma at the level of the starting chunk
+    */
+
+   auto const pc_in_funccall    = pc->flags & PCF_IN_FCN_CALL;
+   auto const start_in_funccall = m_start->flags & PCF_IN_FCN_CALL;
+
+   if (  (  pc_in_funccall.test_any()
+         && start_in_funccall.test_any()
+         && chunk_is_token(pc, CT_COMMA)
+         && pc->level == m_start->level)
+      || (  pc_in_funcdef.test_any()
+         && (  (  chunk_is_token(pc, CT_FPAREN_CLOSE)
+               && pc->level < m_start->level)
+            || (  (  chunk_is_token(pc, CT_ASSIGN)
+                  || chunk_is_token(pc, CT_COMMA))
+               && pc->level == m_start->level))))
+   {
+      return(true);
+   }
+   return(false);
+} // EnumStructUnionParser::is_potential_end_chunk
+
+
+bool EnumStructUnionParser::is_within_conditional(chunk_t *pc) const
+{
+   LOG_FUNC_ENTRY();
+
+   auto question_operators = get_question_operators();
+
+   if (!question_operators.empty())
+   {
+      auto &&it_token_chunk_pair = question_operators.cbegin();
+
+      while (it_token_chunk_pair != question_operators.cend())
+      {
+         auto *question = it_token_chunk_pair->second;
+         auto *end      = skip_to_expression_end(question);
+         auto *start    = skip_to_expression_start(question);
+
+         if (chunk_is_between(pc, start, end))
+         {
+            return(true);
+         }
+         ++it_token_chunk_pair;
+      }
+   }
+   return(false);
+} // EnumStructUnionParser::is_within_conditional
+
+
+bool EnumStructUnionParser::is_within_inheritance_list(chunk_t *pc) const
+{
+   LOG_FUNC_ENTRY();
+
+   if (  pc != nullptr
+      && pc->flags.test(PCF_IN_CLASS_BASE))
+   {
+      return(true);
+   }
+   auto *inheritance_end   = get_inheritance_end();
+   auto *inheritance_start = get_inheritance_start();
+
+   if (  inheritance_end != nullptr
+      && inheritance_start != nullptr)
+   {
+      return(chunk_is_between(pc, inheritance_start, inheritance_end));
+   }
+   return(false);
+} // EnumStructUnionParser::is_within_inheritance_list
+
+
+bool EnumStructUnionParser::is_within_where_clause(chunk_t *pc) const
+{
+   LOG_FUNC_ENTRY();
+
+   if (  pc != nullptr
+      && pc->flags.test(PCF_IN_WHERE_SPEC))
+   {
+      return(true);
+   }
+   auto *where_end   = get_where_end();
+   auto *where_start = get_where_start();
+
+   if (  where_end != nullptr
+      && where_start != nullptr)
+   {
+      return(chunk_is_between(pc, where_start, where_end));
+   }
+   return(false);
+} // EnumStructUnionParser::is_within_where_clause
+
+
+void EnumStructUnionParser::mark_base_classes(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   pcf_flags_t flags = PCF_VAR_1ST_DEF;
+
+   while (pc != nullptr)
+   {
+      chunk_flags_set(pc, PCF_IN_CLASS_BASE);
+      /**
+       * clear the PCF_VAR_TYPE flag for all chunks within the inheritance list
+       * TODO: this may not be necessary in the future once code outside this
+       *       class is improved such that PCF_VAR_TYPE is not set for these chunks
+       */
+      pc->flags &= ~PCF_VAR_TYPE;
+
+      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+
+      if (chunk_is_token(next, CT_DC_MEMBER))
+      {
+         /**
+          * just in case it's a templated type
+          */
+         pc = skip_template_prev(pc);
+
+         if (chunk_is_token(pc, CT_WORD))
+         {
+            /**
+             * TODO:
+             * To comply with conventions used elsewhere in the code, we're going
+             * to change chunks marked CT_WORD to CT_TYPE if followed by a scope-
+             * resolution operator; if a chunk marked CT_WORD is followed by a set
+             * of angle brackets, then it's obviously a templated type. However,
+             * in the absence of a pair trailing angle brackets, the chunk may be
+             * a namespace rather than a type. Need to revisit this!
+             */
+            set_chunk_type(pc, CT_TYPE);
+         }
+      }
+      else if (  (  chunk_is_token(next, CT_BRACE_OPEN)
+                 || (  chunk_is_token(next, CT_COMMA)
+                    && !is_within_where_clause(next)))
+              && next->level == m_start->level)
+      {
+         /**
+          * just in case it's a templated type
+          */
+         pc = skip_template_prev(pc);
+
+         if (chunk_is_token(pc, CT_WORD))
+         {
+            chunk_flags_set(pc, flags);
+
+            if (flags & PCF_VAR_1ST)
+            {
+               flags &= ~PCF_VAR_1ST; // clear the first flag for the next items
+            }
+         }
+
+         if (chunk_is_token(next, CT_BRACE_OPEN))
+         {
+            break;
+         }
+      }
+      pc = next;
+   }
+   chunk_flags_set(pc, PCF_IN_CLASS_BASE);
+} // EnumStructUnionParser::mark_base_classes
+
+
+void EnumStructUnionParser::mark_braces(chunk_t *brace_open)
+{
+   LOG_FUNC_ENTRY();
+
+   pcf_flags_t flags = PCF_NONE;
+
+   if (chunk_is_token(m_start, CT_CLASS))
+   {
+      flags = PCF_IN_CLASS;
+   }
+   else if (chunk_is_enum(m_start))
+   {
+      flags = PCF_IN_ENUM;
+   }
+   else if (chunk_is_token(m_start, CT_STRUCT))
+   {
+      flags = PCF_IN_STRUCT;
+   }
+   /**
+    * TODO: why does flag_parens() flag the closing paren,
+    *       but it doesn't flag the opening paren?
+    */
+
+   flag_parens(brace_open,
+               flags,
+               CT_NONE,
+               CT_NONE,
+               false);
+
+   if (chunk_is_class_struct_union(m_start))
+   {
+      mark_struct_union_body(brace_open);
+
+      auto *inheritance_start = get_inheritance_start();
+
+      if (inheritance_start != nullptr)
+      {
+         /**
+          * the class/struct/union is a derived class; mark the base
+          * classes between the colon/java "implements" keyword and the
+          * opening brace
+          */
+
+         mark_base_classes(inheritance_start);
+      }
+   }
+   set_chunk_parent(brace_open, m_start->type);
+
+   auto *brace_close = chunk_skip_to_match(brace_open, scope_e::PREPROC);
+
+   if (brace_close != nullptr)
+   {
+      set_chunk_parent(brace_close, m_start->type);
+   }
+} // EnumStructUnionParser::mark_braces
+
+
+void EnumStructUnionParser::mark_class_colon(chunk_t *colon)
+{
+   LOG_FUNC_ENTRY();
+
+   LOG_FMT(LFTOR,
+           "%s(%d): Class colon detected: orig_line is %zu, orig_col is %zu\n",
+           __unqualified_func__,
+           __LINE__,
+           colon->orig_line,
+           colon->orig_col);
+
+   set_chunk_type(colon, CT_CLASS_COLON);
+   set_chunk_parent(colon, m_start->type);
+} // EnumStructUnionParser::mark_class_colon
+
+
+void EnumStructUnionParser::mark_conditional_colon(chunk_t *colon)
+{
+   set_chunk_type(colon, CT_COND_COLON);
+} // EnumStructUnionParser::mark_conditional_colon
+
+
+void EnumStructUnionParser::mark_constructors()
+{
+   LOG_FUNC_ENTRY();
+
+   /**
+    * if a type was previously identified, then look for
+    * class/struct constructors in the body
+    */
+   if (  body_detected()
+      && type_identified()
+      && chunk_is_class_or_struct(m_start))
+   {
+      LOG_FMT(LFTOR,
+              "%s(%d): orig_line is %zu, orig_col is %zu, start is '%s', parent_type is %s\n",
+              __unqualified_func__,
+              __LINE__,
+              m_start->orig_line,
+              m_start->orig_col,
+              m_start->text(),
+              get_token_name(get_chunk_parent_type(m_start)));
+
+      log_pcf_flags(LFTOR, m_start->flags);
+
+      /**
+       * get the name of the type
+       */
+      auto *body_end   = get_body_end();
+      auto *body_start = get_body_start();
+      auto *name       = m_type->text();
+
+      LOG_FMT(LFTOR,
+              "%s(%d): Name of type is '%s'\n",
+              __unqualified_func__,
+              __LINE__,
+              name);
+      log_pcf_flags(LFTOR, m_type->flags);
+
+      chunk_t     *next = nullptr;
+      std::size_t level = m_type->brace_level + 1;
+
+      for (auto *prev = body_start; next != body_end; prev = next)
+      {
+         chunk_flags_set(prev, PCF_IN_CLASS);
+
+         next = chunk_get_next_ncnnl(prev, scope_e::PREPROC);
+
+         /**
+          * find a chunk within the class/struct body that
+          */
+         if (  prev != nullptr
+            && std::strcmp(prev->text(), name) == 0
+            && prev->level == level
+            && chunk_is_paren_open(next))
+         {
+            set_chunk_type(prev, CT_FUNC_CLASS_DEF);
+
+            LOG_FMT(LFTOR,
+                    "%s(%d): Constructor/destructor detected: '%s' at orig_line is %zu, orig_col is %zu, type is %s\n",
+                    __unqualified_func__,
+                    __LINE__,
+                    name,
+                    prev->orig_line,
+                    prev->orig_col,
+                    get_token_name(prev->type));
+
+            mark_cpp_constructor(prev);
+         }
+      }
+
+      chunk_flags_set(next, PCF_IN_CLASS);
+   }
+} // EnumStructUnionParser::mark_constructor
+
+
+void EnumStructUnionParser::mark_enum_integral_type(chunk_t *colon)
+{
+   LOG_FUNC_ENTRY();
+
+   set_chunk_type(colon, CT_BIT_COLON);
+   set_chunk_parent(colon, m_start->type);
+
+   auto *body_start = get_body_start();
+   auto *pc         = chunk_get_next_ncnnl(colon);
+
+   /**
+    * the chunk(s) between the colon and opening
+    * brace (if present) should specify the enum's
+    * integral type
+    */
+
+   while (  chunk_is_between(pc, m_start, m_end)
+         && pc != body_start
+         && chunk_is_not_token(pc, CT_BRACE_OPEN)
+         && !chunk_is_semicolon(pc))
+   {
+      /**
+       * clear the PCF_VAR_TYPE flag for all chunks within the enum integral base
+       * TODO: this may not be necessary in the future once code outside this
+       *       class is improved such that PCF_VAR_TYPE is not set for these chunks
+       */
+      pc->flags &= ~PCF_VAR_TYPE;
+
+      set_chunk_type(pc, CT_TYPE);
+      set_chunk_parent(pc, colon->type);
+
+      pc = chunk_get_next_ncnnl(pc);
+   }
+} // EnumStructUnionParser::mark_enum_integral_type
+
+
+void EnumStructUnionParser::mark_extracorporeal_lvalues()
+{
+   /**
+    * clear the PCF_LVALUE flag for all chunks outside the body definition,
+    * as this flag may have been set elsewhere by code outside this class
+    * TODO: the mark_lvalue() function needs some improvement so that the
+    *       following isn't necessary
+    */
+   chunk_t *next = m_start;
+   chunk_t *prev = nullptr;
+
+   /**
+    * if the class is a template, go the extra step and correct the
+    * erroneously marked chunks - as previously mentioned, this likely
+    * won't be necessary with improvements to the mark_lvalue() function
+    */
+   if (get_chunk_parent_type(next) == CT_TEMPLATE)
+   {
+      while (true)
+      {
+         prev = chunk_get_prev_ncnnlni(next);
+
+         if (  prev == nullptr
+            || (  !prev->flags.test(PCF_IN_TEMPLATE)
+               && chunk_is_not_token(prev, CT_TEMPLATE)))
+         {
+            break;
+         }
+         next = prev;
+      }
+   }
+   auto *body_end   = get_body_end();
+   auto *body_start = get_body_start();
+
+   while (next != m_end)
+   {
+      if (  !chunk_is_between(next, body_start, body_end)
+         && next->flags.test(PCF_LVALUE))
+      {
+         next->flags &= ~PCF_LVALUE;
+      }
+      else if (  (  chunk_is_token(next, CT_ASSIGN)
+                 || chunk_is_token(next, CT_BRACE_OPEN))
+              && chunk_is_token(prev, CT_WORD)
+              && prev->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
+      {
+         chunk_flags_set(prev, PCF_LVALUE);
+      }
+      prev = next;
+      next = chunk_get_next_ncnnl(next);
+   }
+} // EnumStructUnionParser::mark_extracorporeal_lavlues
+
+
+void EnumStructUnionParser::mark_nested_name_specifiers(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   auto start_end_pair = match_qualified_identifier(pc);
+   auto start          = start_end_pair.first;
+   auto end            = start_end_pair.second;
+
+   for (pc = start; chunk_is_between(pc, start, end); pc = chunk_get_next_ncnnl(pc))
+   {
+      if (chunk_is_token(pc, CT_WORD))
+      {
+         /**
+          * if the next token is an opening angle, then we can safely
+          * mark the current identifier as a type
+          */
+         auto *next = chunk_get_next_ncnnl(pc);
+
+         if (chunk_is_token(next, CT_ANGLE_OPEN))
+         {
+            /**
+             * the template may have already been previously marked elsewhere...
+             */
+            auto *angle_open  = next;
+            auto *angle_close = chunk_skip_to_match(angle_open, scope_e::PREPROC);
+
+            if (angle_close == nullptr)
+            {
+               // parse error
+               parse_error_detected(true);
+
+               // TODO: should this be just a warning or an error (with exit condition?)
+               LOG_FMT(LWARN,
+                       "%s(%d): Unmatched '<' at orig_line is %zu, orig_col is %zu\n",
+                       __unqualified_func__,
+                       __LINE__,
+                       angle_open->orig_line,
+                       angle_open->orig_col);
+
+               break;
+            }
+            set_chunk_type(pc, CT_TYPE);
+            mark_template(next);
+            pc = angle_close;
+         }
+         else if (  is_within_inheritance_list(pc)
+                 && (  chunk_is_token(next, CT_COMMA)
+                    || chunk_is_token(next, CT_BRACE_OPEN)))
+         {
+            set_chunk_type(pc, CT_TYPE);
+         }
+      }
+   }
+} // EnumStructUnionParser::mark_nested_name_specifiers
+
+
+void EnumStructUnionParser::mark_pointer_types(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(pc, CT_WORD))
+   {
+      do
+      {
+         // TODO: should there be a CT_BYREF_TYPE?
+         pc = chunk_get_prev_ncnnlni(pc);
+
+         if (chunk_is_ptr_operator(pc))
+         {
+            set_chunk_parent(pc, m_start->type);
+            set_chunk_type(pc, CT_PTR_TYPE);
+         }
+      } while (chunk_is_pointer_reference_or_qualifier(pc));
+   }
+} // EnumStructUnionParser::mark_pointer_types
+
+
+void EnumStructUnionParser::mark_template(chunk_t *start) const
+{
+   LOG_FUNC_ENTRY();
+
+   if (start != nullptr)
+   {
+      LOG_FMT(LTEMPL,
+              "%s(%d): Template detected: '%s' at orig_line %zu, orig_col %zu\n",
+              __unqualified_func__,
+              __LINE__,
+              start->text(),
+              start->orig_line,
+              start->orig_col);
+   }
+   set_chunk_parent(start, CT_TEMPLATE);
+
+   auto *end = chunk_skip_to_match(start, scope_e::PREPROC);
+
+   if (end != nullptr)
+   {
+      set_chunk_parent(end, CT_TEMPLATE);
+
+      mark_template_args(start, end);
+   }
+} // EnumStructUnionParser::mark_template
+
+
+void EnumStructUnionParser::mark_template_args(chunk_t *start, chunk_t *end) const
+{
+   LOG_FUNC_ENTRY();
+
+   if (  end != nullptr
+      && start != nullptr)
+   {
+      LOG_FMT(LTEMPL,
+              "%s(%d): Start of template detected: '%s' at orig_line %zu, orig_col %zu\n",
+              __unqualified_func__,
+              __LINE__,
+              start->text(),
+              start->orig_line,
+              start->orig_col);
+
+      pcf_flags_t flags = PCF_IN_TEMPLATE;
+      chunk_t     *next = start;
+
+      /**
+       * TODO: for now, just mark the chunks within the template as PCF_IN_TEMPLATE;
+       *       we probably need to create a TemplateParser class to handle all
+       *       things template-related
+       */
+
+      while (true)
+      {
+         next = chunk_get_next_ncnnl(next);
+
+         if (next == end)
+         {
+            break;
+         }
+         chunk_flags_set(next, flags);
+      }
+      LOG_FMT(LTEMPL,
+              "%s(%d): End of template detected: '%s' at orig_line %zu, orig_col %zu\n",
+              __unqualified_func__,
+              __LINE__,
+              end->text(),
+              end->orig_line,
+              end->orig_col);
+   }
+} // EnumStructUnionParser::mark_template_args
+
+
+void EnumStructUnionParser::mark_type(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   if (pc != nullptr)
+   {
+      m_type = pc;
+
+      do
+      {
+         make_type(pc);
+         set_chunk_parent(pc, m_start->type);
+         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      } while (chunk_is_pointer_or_reference(pc));
+   }
+} // EnumStructUnionParser::mark_type
+
+
+void EnumStructUnionParser::mark_variable(chunk_t *variable, pcf_flags_t flags)
+{
+   LOG_FUNC_ENTRY();
+
+   if (variable != nullptr)
+   {
+      LOG_FMT(LVARDEF,
+              "%s(%d): Variable definition detected: '%s' at orig_line is %zu, orig_col is %zu, set %s\n",
+              __unqualified_func__,
+              __LINE__,
+              variable->text(),
+              variable->orig_line,
+              variable->orig_col,
+              flags & PCF_VAR_1ST_DEF ? "PCF_VAR_1ST_DEF" : "PCF_VAR_1ST");
+
+      chunk_flags_set(variable, flags);
+      set_chunk_type(variable, CT_WORD);
+      mark_pointer_types(variable);
+   }
+} // EnumStructUnionParser::mark_variable
+
+
+void EnumStructUnionParser::mark_where_clause(chunk_t *where)
+{
+   LOG_FUNC_ENTRY();
+
+   if (where != nullptr)
+   {
+      LOG_FMT(LFTOR,
+              "%s(%d): Where clause detected: orig_line is %zu, orig_col is %zu\n",
+              __unqualified_func__,
+              __LINE__,
+              where->orig_line,
+              where->orig_col);
+   }
+   set_where_start(where);
+
+   auto *where_end   = get_where_end();
+   auto *where_start = get_where_start();
+
+   set_where_end(where_end);
+
+   pcf_flags_t flags;
+
+   for (auto *pc = where_start; pc != where_end; pc = chunk_get_next_ncnnl(pc))
+   {
+      flags = mark_where_chunk(pc, m_start->type, flags);
+   }
+} // EnumStructUnionParser::mark_where_clause
+
+
+void EnumStructUnionParser::mark_where_colon(chunk_t *colon)
+{
+   LOG_FUNC_ENTRY();
+
+   if (colon != nullptr)
+   {
+      LOG_FMT(LFTOR,
+              "%s(%d): Where colon detected: orig_line is %zu, orig_col is %zu\n",
+              __unqualified_func__,
+              __LINE__,
+              colon->orig_line,
+              colon->orig_col);
+   }
+   set_chunk_type(colon, CT_WHERE_COLON);
+   set_chunk_parent(colon, m_start->type);
+} // EnumStructUnionParser::mark_where_colon
+
+
+void EnumStructUnionParser::parse(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   initialize(pc);
+
+   /**
+    * make sure this wasn't a cast, and also make sure we're
+    * actually dealing with a class/enum/struct/union type
+    */
+   if (  get_chunk_parent_type(m_start) == CT_C_CAST
+      || !chunk_is_class_enum_struct_union(m_start))
+   {
+      return;
+   }
+   chunk_t *prev = m_start;
+   chunk_t *next = chunk_get_next_ncnnl(prev);
+
+   /**
+    * the enum-key might be enum, enum class or enum struct
+    */
+   if (chunk_is_enum(next))
+   {
+      prev = next;
+      next = chunk_get_next_ncnnl(prev);
+   }
+   else if (chunk_is_enum(prev))
+   {
+      auto *prev_prev = chunk_get_prev_ncnnlni(prev);
+
+      if (  chunk_is_enum(prev_prev)
+         && chunk_is_enum(prev))
+      {
+         m_start = prev_prev;
+      }
+   }
+   /**
+    * pre-process all chunks between the starting and ending chunks identified
+    * in the initial pass
+    */
+
+   while (chunk_is_between(next, m_start, m_end))
+   {
+      /**
+       * skip attributes
+       */
+      next = skip_attribute(next);
+
+      /**
+       * skip declspec
+       */
+      next = skip_declspec(next);
+
+      /**
+       * skip any right-hand side assignments
+       */
+      if (chunk_is_token(next, CT_ASSIGN))
+      {
+         next = skip_to_expression_end(next);
+      }
+
+      if (  chunk_is_token(next, CT_ANGLE_OPEN)
+         && !template_detected())
+      {
+         next = parse_angles(next);
+      }
+      else if (  chunk_is_token(next, CT_BRACE_OPEN)
+              && !body_detected())
+      {
+         next = parse_braces(next);
+      }
+      else if (chunk_is_colon(next))
+      {
+         parse_colon(next);
+      }
+      else if (chunk_is_token(next, CT_COMMA))
+      {
+         record_top_level_comma(next);
+      }
+      else if (chunk_is_token(next, CT_DC_MEMBER))
+      {
+         next = parse_double_colon(next);
+      }
+      else if (  chunk_is_paren_open(next)
+              && (  language_is_set(LANG_D)
+                 || (  language_is_set(LANG_PAWN)
+                    && chunk_is_enum(m_start))))
+      {
+         set_paren_parent(next, m_start->type);
+
+         if (  chunk_is_token(prev, CT_WORD)
+            && language_is_set(LANG_D))
+         {
+            mark_template(next);
+         }
+         next = chunk_skip_to_match(next, scope_e::PREPROC);
+      }
+      else if (  chunk_is_token(next, CT_QUALIFIER)
+              && language_is_set(LANG_JAVA)
+              && std::strncmp(next->str.c_str(), "implements", 10) == 0)
+      {
+         mark_base_classes(next);
+      }
+      else if (chunk_is_token(next, CT_QUESTION))
+      {
+         record_question_operator(next);
+      }
+      else if (  chunk_is_token(next, CT_WHERE)
+              && !where_clause_detected())
+      {
+         mark_where_clause(next);
+      }
+      prev = next;
+
+      do
+      {
+         next = chunk_get_next_ncnnl(next);
+      } while (  next != nullptr
+              && next->level > m_start->level);
+   }
+   /**
+    * identify the type and/or variable(s)
+    */
+   analyze_identifiers();
+
+   /**
+    * identify and mark lvalues occurring outside the body definition
+    */
+   mark_extracorporeal_lvalues();
+
+   if (  prev != nullptr
+      && chunk_is_semicolon(prev)
+      && prev->level == m_start->level
+      && !prev->flags.test(PCF_IN_FOR))
+   {
+      set_chunk_parent(prev, m_start->type);
+   }
+} // EnumStructUnionParser::parse
+
+
+chunk_t *EnumStructUnionParser::parse_angles(chunk_t *angle_open)
+{
+   LOG_FUNC_ENTRY();
+
+   /**
+    * first check to see if the open angle occurs within an inheritance list
+    */
+   auto *pc = angle_open;
+
+   if (!is_within_inheritance_list(pc))
+   {
+      /**
+       * check to see if there's a matching closing angle bracket
+       */
+      auto *angle_close = chunk_skip_to_match(angle_open, scope_e::PREPROC);
+
+      if (angle_close == nullptr)
+      {
+         // parse error
+         parse_error_detected(true);
+
+         // TODO: should this be just a warning or an error (with exit condition?)
+         LOG_FMT(LWARN,
+                 "%s(%d): Unmatched '<' at orig_line is %zu, orig_col is %zu\n",
+                 __unqualified_func__,
+                 __LINE__,
+                 angle_open->orig_line,
+                 angle_open->orig_col);
+      }
+      else
+      {
+         /**
+          * check to make sure that the template is the final chunk in a list
+          * of scope-resolution qualifications
+          */
+         auto *next = chunk_get_next_ncnnl(angle_close);
+
+         if (chunk_is_not_token(next, CT_DC_MEMBER))
+         {
+            set_template_start(angle_open);
+
+            /**
+             * we could be dealing with a template type; if so, the opening angle
+             * bracket should be preceded by a CT_WORD token and we should have
+             * found a closing angle bracket
+             */
+            auto *prev = chunk_get_prev_ncnnlni(angle_open);
+
+            if (chunk_is_not_token(prev, CT_WORD))
+            {
+               // parse error
+               parse_error_detected(true);
+
+               // TODO: should this be just a warning or an error (with exit condition?)
+               LOG_FMT(LWARN,
+                       "%s(%d): Identifier missing before '<' at orig_line is %zu, orig_col is %zu\n",
+                       __unqualified_func__,
+                       __LINE__,
+                       angle_open->orig_line,
+                       angle_open->orig_col);
+            }
+            else
+            {
+               set_template_end(angle_close);
+               mark_template(angle_open);
+            }
+         }
+         /**
+          * update input argument to point to the closing angle bracket
+          */
+         pc = angle_close;
+      }
+   }
+   return(pc);
+} // EnumStructUnionParser::parse_angles
+
+
+chunk_t *EnumStructUnionParser::parse_braces(chunk_t *brace_open)
+{
+   LOG_FUNC_ENTRY();
+
+   /**
+    * check to see if there's a matching closing brace
+    */
+
+   auto *pc          = brace_open;
+   auto *brace_close = chunk_skip_to_match(pc, scope_e::PREPROC);
+
+   if (brace_close != nullptr)
+   {
+      /**
+       * we could be dealing with a variable definition preceded by
+       * the class/struct keyword. It's possible that the variable is
+       * assigned via direct-list initialization, hence the open brace
+       * is NOT part of a class/struct type definition.
+       */
+      auto *first_comma = get_first_top_level_comma();
+
+      if (chunk_is_after(pc, first_comma))
+      {
+         /**
+          * the open brace occurs after a top-level comma was encountered, which
+          * likely implies a direct-initialization or braced initializer list in
+          * the midst of a list of variable definitions
+          */
+
+         return(pc);
+      }
+      set_body_end(brace_close);
+      set_body_start(brace_open);
+
+      auto *enum_base_start   = get_enum_base_start();
+      auto *inheritance_start = get_inheritance_start();
+      auto *prev              = chunk_get_prev_ncnnlni(pc);
+
+      /**
+       * check to see if the open brace was preceded by a closing paren;
+       * it could possibly be a function-like macro call preceding the
+       * open brace, but it's more likely that we're dealing with a
+       * signature associated with a function definition
+       */
+
+      if (  language_is_set(LANG_D)
+         || language_is_set(LANG_PAWN)
+         || !chunk_is_paren_close(prev)
+         || chunk_is_between(prev, enum_base_start, brace_open)
+         || chunk_is_between(prev, inheritance_start, brace_open))
+      {
+         mark_braces(brace_open);
+
+         /**
+          * D does not require a semicolon after an enum, but we add one to make
+          * other code happy.
+          */
+         if (  language_is_set(LANG_D)
+            && chunk_is_enum(m_start))
+         {
+            pawn_add_vsemi_after(brace_close); // Issue #2279
+         }
+         pc = brace_close;
+      }
+      else
+      {
+         // TODO: should this be just a warning or an error (with exit condition?)
+         LOG_FMT(LWARN,
+                 "%s(%d): Parsing error precedes start of body '{' at orig_line is %zu, orig_col is %zu\n",
+                 __unqualified_func__,
+                 __LINE__,
+                 brace_open->orig_line,
+                 brace_open->orig_col);
+
+         // parse error
+         parse_error_detected(true);
+      }
+   }
+   return(pc);
+} // EnumStructUnionParser::parse_braces
+
+
+void EnumStructUnionParser::parse_colon(chunk_t *colon)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(m_start, CT_UNION))
+   {
+      /**
+       * unions do not implement inheritance
+       */
+
+      // TODO: should this be just a warning or an error (with exit condition?)
+      LOG_FMT(LWARN,
+              "%s(%d): Colon follows union declaration at orig_line is %zu, orig_col is %zu\n",
+              __unqualified_func__,
+              __LINE__,
+              colon->orig_line,
+              colon->orig_col);
+
+      // parse error
+      parse_error_detected(true);
+   }
+   else if (is_within_conditional(colon))
+   {
+      mark_conditional_colon(colon);
+   }
+   else if (is_within_where_clause(colon))
+   {
+      mark_where_colon(colon);
+   }
+   else if (!inheritance_detected())
+   {
+      if (chunk_is_class_or_struct(m_start))
+      {
+         /**
+          * the colon likely specifies an inheritance list for a struct
+          * or class type
+          */
+
+         set_inheritance_start(colon);
+         mark_class_colon(colon);
+      }
+      else if (chunk_is_enum(m_start))
+      {
+         set_enum_base_start(colon);
+         mark_enum_integral_type(colon);
+      }
+   }
+} // EnumStructUnionParser::parse_colon
+
+
+chunk_t *EnumStructUnionParser::parse_double_colon(chunk_t *double_colon)
+{
+   LOG_FUNC_ENTRY();
+
+   auto *pc = double_colon;
+
+   if (  language_is_set(LANG_CPP)
+      && chunk_is_token(pc, CT_DC_MEMBER))
+   {
+      mark_nested_name_specifiers(pc);
+      pc = skip_scope_resolution_and_nested_name_specifiers(pc);
+   }
+   return(pc);
+} // EnumStructUnionParser::parse_double_colon
+
+
+bool EnumStructUnionParser::parse_error_detected() const
+{
+   LOG_FUNC_ENTRY();
+
+   return(m_parse_error);
+} // EnumStructUnionParser::parse_error_detected
+
+
+void EnumStructUnionParser::parse_error_detected(bool status)
+{
+   LOG_FUNC_ENTRY();
+
+   m_parse_error = status;
+} // EnumStructUnionParser::parse_error_detected
+
+
+void EnumStructUnionParser::record_question_operator(chunk_t *question)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(question, CT_QUESTION))
+   {
+      std::size_t index = m_chunk_map[CT_QUESTION].size();
+
+      m_chunk_map[CT_QUESTION][index] = question;
+   }
+} // EnumStructUnionParser::record_question_operator
+
+
+void EnumStructUnionParser::record_top_level_comma(chunk_t *comma)
+{
+   if (  comma != nullptr
+      && comma->level == m_start->level
+      && !is_within_conditional(comma)
+      && !is_within_inheritance_list(comma))
+   {
+      std::size_t index = m_chunk_map[CT_COMMA].size();
+
+      m_chunk_map[CT_COMMA][index] = comma;
+   }
+} // EnumStructUnionParser::record_top_level_comma
+
+
+chunk_t *EnumStructUnionParser::refine_end_chunk(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  (  language_is_set(LANG_C)
+         || language_is_set(LANG_CPP))
+      && chunk_is_token(pc, CT_BRACE_CLOSE))
+   {
+      /**
+       * if dealing with C/C++, one or more trailing variable definitions may
+       * follow the closing brace; a semi-colon should've been good enough to
+       * indicate the terminating condition, however some of the classes defined
+       * in the input tests cases for Continuous Integration DO NOT correctly
+       * terminate classes/struct with a semicolon (which is compilation error).
+       * As a consequence, more checks must be performed to determine where
+       * the terminating chunk is located. For instance, see operator.cpp and
+       * enum_comma.h for examples of offenders
+       */
+      auto *next = chunk_get_next_ncnnl(pc);
+
+      while (true)
+      {
+         if (chunk_is_semicolon(next))
+         {
+            pc = next;
+
+            break;
+         }
+         else
+         {
+            /**
+             * if we're sitting at a comma, skip it
+             */
+            if (chunk_is_token(next, CT_COMMA))
+            {
+               next = chunk_get_next_ncnnl(next);
+            }
+            auto match       = match_variable(next, m_start->level);
+            auto *start      = std::get<0>(match);
+            auto *identifier = std::get<1>(match);
+            auto *end        = std::get<2>(match);
+
+            if (  end == nullptr
+               || identifier == nullptr
+               || start == nullptr)
+            {
+               break;
+            }
+            else
+            {
+               pc = chunk_get_next_ncnnl(end);
+
+               /**
+                * skip any right-hand side assignments
+                */
+               if (chunk_is_token(pc, CT_ASSIGN))
+               {
+                  pc = skip_to_expression_end(pc);
+               }
+               next = pc;
+            }
+         }
+      }
+   }
+   return(pc);
+} // EnumStructUnionParser::refine_end_chunk
+
+
+void EnumStructUnionParser::set_body_end(chunk_t *body_end)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(body_end, CT_BRACE_CLOSE))
+   {
+      m_chunk_map[CT_BRACE_CLOSE][0] = body_end;
+   }
+} // EnumStructUnionParser::set_body_end
+
+
+void EnumStructUnionParser::set_body_start(chunk_t *body_start)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(body_start, CT_BRACE_OPEN))
+   {
+      m_chunk_map[CT_BRACE_OPEN][0] = body_start;
+   }
+} // EnumStructUnionParser::set_body_start
+
+
+void EnumStructUnionParser::set_enum_base_start(chunk_t *enum_base_start)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_colon(enum_base_start))
+   {
+      m_chunk_map[CT_BIT_COLON][0] = enum_base_start;
+   }
+} // EnumStructUnionParser::set_enum_base_start
+
+
+void EnumStructUnionParser::set_inheritance_start(chunk_t *inheritance_start)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_colon(inheritance_start))
+   {
+      m_chunk_map[CT_COLON][0] = inheritance_start;
+   }
+} // EnumStructUnionParser::set_inheritance_start
+
+
+void EnumStructUnionParser::set_template_end(chunk_t *template_end)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(template_end, CT_ANGLE_CLOSE))
+   {
+      m_chunk_map[CT_ANGLE_CLOSE][0] = template_end;
+   }
+} // EnumStructUnionParser::set_template_end
+
+
+void EnumStructUnionParser::set_template_start(chunk_t *template_start)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(template_start, CT_ANGLE_OPEN))
+   {
+      m_chunk_map[CT_ANGLE_OPEN][0] = template_start;
+   }
+} // EnumStructUnionParser::set_template_start
+
+
+void EnumStructUnionParser::set_where_end(chunk_t *where_end)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(where_end, CT_BRACE_OPEN))
+   {
+      m_chunk_map[CT_WHERE][0] = where_end;
+   }
+} // EnumStructUnionParser::set_where_end
+
+
+void EnumStructUnionParser::set_where_start(chunk_t *where_start)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(where_start, CT_WHERE))
+   {
+      m_chunk_map[CT_WHERE][0] = where_start;
+   }
+} // EnumStructUnionParser::set_where_start
+
+
+bool EnumStructUnionParser::template_detected() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto *template_end   = get_template_end();
+   auto *template_start = get_template_start();
+
+   return(  template_end != nullptr
+         && template_start != nullptr);
+} // EnumStructUnionParser::template_detected
+
+
+chunk_t *EnumStructUnionParser::try_find_end_chunk(chunk_t *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   do
+   {
+      /**
+       * clear some previously marked token types, some of which have likely
+       * been erroneously marked up to this point; a good example of this
+       * arises when macro variables and/or macro function calls follow the
+       * class/enum/struct/union keyword and precede the actual type name
+       */
+      if (  chunk_is_token(pc, CT_TYPE)
+         || chunk_is_token(pc, CT_WORD))
+      {
+         set_chunk_type(pc, CT_WORD);
+         set_chunk_parent(pc, CT_NONE);
+      }
+
+      do
+      {
+         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      } while (  pc != nullptr
+              && pc->level > m_start->level);
+   } while (!is_potential_end_chunk(pc));
+
+   /**
+    * perform a second pass for c++ that
+    */
+   pc = refine_end_chunk(pc);
+
+   return(pc);
+} // EnumStructUnionParser::try_find_end_chunk
+
+
+void EnumStructUnionParser::try_post_identify_macro_calls()
+{
+   LOG_FUNC_ENTRY();
+
+   if (  language_is_set(LANG_CPP)
+      && type_identified())
+   {
+      /**
+       * for all chunks at class/enum/struct/union level, identify function-like
+       * macro calls and mark them as CT_MACRO_FUNC_CALL. The reason for doing
+       * so is to avoid mis-interpretation by code executed at a later time
+       */
+
+      auto    *body_start        = get_body_start();
+      auto    *inheritance_start = get_inheritance_start();
+      chunk_t *pc                = m_start;
+      chunk_t *prev              = nullptr;
+
+      do
+      {
+         if (  !chunk_is_between(prev, inheritance_start, body_start)
+            && (  chunk_is_token(prev, CT_WORD)
+               || chunk_is_token(prev, CT_FUNCTION)
+               || chunk_is_token(prev, CT_FUNC_DEF))
+            && !prev->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE)
+            && prev->level == m_start->level)
+         {
+            if (chunk_is_paren_open(pc))
+            {
+               auto *paren_open  = pc;
+               auto *paren_close = chunk_skip_to_match(paren_open, scope_e::PREPROC);
+
+               if (paren_close != nullptr)
+               {
+                  set_chunk_type(paren_open, CT_FPAREN_OPEN);
+                  set_chunk_parent(paren_open, CT_MACRO_FUNC_CALL);
+                  set_chunk_type(paren_close, CT_FPAREN_CLOSE);
+                  set_chunk_parent(paren_close, CT_MACRO_FUNC_CALL);
+                  set_chunk_type(prev, CT_MACRO_FUNC_CALL);
+               }
+            }
+         }
+         prev = pc;
+         pc   = chunk_get_next_ncnnl(prev);
+      } while (chunk_is_between(pc, m_start, m_end));
+   }
+} // EnumStructUnionParser::try_post_identify_macro_calls
+
+
+void EnumStructUnionParser::try_post_identify_type()
+{
+   LOG_FUNC_ENTRY();
+
+   chunk_t *body_end = get_body_end();
+
+   if (  !type_identified()
+      && body_end == nullptr)
+   {
+      /**
+       * a type wasn't identified and no closing brace is present; we're
+       * likely not dealing with an anonymous enum/class/struct
+       */
+
+      /**
+       * a type has yet to be identified, so search for the last word
+       * that hasn't been marked as a variable
+       */
+      chunk_t *type = nullptr;
+      chunk_t *pc   = m_start;
+
+      do
+      {
+         /**
+          * in case it's a qualified identifier, skip scope-resolution and
+          * nested name specifiers and return just the qualified identifier name
+          */
+         pc = skip_scope_resolution_and_nested_name_specifiers(pc);
+
+         if (pc->flags.test_any(PCF_VAR_DEF | PCF_VAR_1ST | PCF_VAR_INLINE))
+         {
+            break;
+         }
+         else if (  chunk_is_token(pc, CT_WORD)
+                 || chunk_is_token(pc, CT_ANGLE_CLOSE))
+         {
+            type = skip_template_prev(pc);
+         }
+         pc = chunk_get_next_ncnnl(pc);
+      } while (chunk_is_between(pc, m_start, m_end));
+
+      if (type != nullptr)
+      {
+         mark_type(type);
+      }
+   }
+} // EnumStructUnionParser::try_post_identify_type
+
+
+bool EnumStructUnionParser::try_pre_identify_type()
+{
+   LOG_FUNC_ENTRY();
+
+   chunk_t *pc = get_body_start();
+
+   if (  language_is_set(LANG_PAWN)
+      && chunk_is_enum(m_start))
+   {
+      set_paren_parent(pc, m_start->type);
+   }
+   else if (template_detected())
+   {
+      pc = get_template_start();
+   }
+   else if (enum_base_detected())
+   {
+      pc = get_enum_base_start();
+   }
+   else if (inheritance_detected())
+   {
+      pc = get_inheritance_start();
+
+      if (chunk_is_token(m_start, CT_UNION))
+      {
+         /**
+          * unions do not implement inheritance
+          */
+
+         // TODO: should this be just a warning or an error (with exit condition?)
+         LOG_FMT(LWARN,
+                 "%s(%d): Bad union declaration detected at orig_line is %zu, orig_col is %zu\n",
+                 __unqualified_func__,
+                 __LINE__,
+                 m_start->orig_line,
+                 m_start->orig_col);
+
+         parse_error_detected(true);
+
+         return(false);
+      }
+   }
+
+   if (pc == nullptr)
+   {
+      chunk_t *next = chunk_get_next_ncnnl(m_start);
+
+      /**
+       * in case it's a qualified identifier, skip scope-resolution and
+       * nested name specifiers and return just the qualified identifier name
+       */
+      next = skip_scope_resolution_and_nested_name_specifiers(next);
+
+      chunk_t *next_next = chunk_get_next_ncnnl(next);
+
+      /**
+       * in case it's a qualified identifier, skip scope-resolution and
+       * nested name specifiers and return just the qualified identifier name
+       */
+      next_next = skip_scope_resolution_and_nested_name_specifiers(next_next);
+
+      /**
+       * if there is one word between the start and end chunks, then we've likely
+       * identified the type; if there are two words, then the first is likely a
+       * type and the second is an instantiation thereof; however, it is possible
+       * that the first word is actually a reference to a macro definition, in which
+       * the second word would be the type
+       */
+      if (next_next == m_end)
+      {
+         pc = next_next;
+      }
+      else if (  next != nullptr
+              && chunk_is_token(next, CT_WORD)
+              && chunk_is_token(next_next, CT_WORD)
+              && chunk_get_prev_ncnnlni(m_end) == next_next)
+      {
+         /**
+          * check to see if we've got a macro reference preceding the last word chunk;
+          * this won't work in all cases, because a macro may be defined in another header
+          * file, but this is an attempt to increase the chances of identifying the correct
+          * chunk as the type
+          */
+         if (  chunk_is_macro_reference(next)
+            || get_chunk_parent_type(m_start) == CT_TEMPLATE)
+         {
+            pc = m_end;
+         }
+         else
+         {
+            pc = next_next;
+         }
+      }
+      else
+      {
+         /**
+          * search for some common patterns that may indicate a type
+          */
+         chunk_t *prev = m_start;
+
+         while (  chunk_is_between(next, m_start, m_end)
+               && (  (  chunk_is_not_token(next, CT_ASSIGN)
+                     && chunk_is_not_token(next, CT_COMMA))
+                  || next->level != m_start->level)
+               && !chunk_is_semicolon(next))
+         {
+            prev = next;
+            next = chunk_get_next_ncnnl(next);
+
+            /**
+             * in case it's a qualified identifier, skip scope-resolution and
+             * nested name specifiers and return just the qualified identifier name
+             */
+            next = skip_scope_resolution_and_nested_name_specifiers(next);
+
+            if (  chunk_is_token(prev, CT_WORD)
+               && chunk_is_pointer_or_reference(next))
+            {
+               pc = next;
+
+               break;
+            }
+         }
+      }
+   }
+
+   if (pc != nullptr)
+   {
+      /**
+       * the chunk preceding the previously selected chunk should indicate the type
+       */
+
+      pc = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);
+
+      if (  chunk_is_token(pc, CT_QUALIFIER)
+         && std::strncmp(pc->str.c_str(), "final", 5) == 0)
+      {
+         pc = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);
+      }
+
+      if (  language_is_set(LANG_D)
+         && chunk_is_paren_close(pc))
+      {
+         pc = chunk_skip_to_match_rev(pc);
+         pc = chunk_get_prev_ncnnlni(pc);
+      }
+
+      if (chunk_is_token(pc, CT_WORD))
+      {
+         mark_type(pc);
+
+         return(true);
+      }
+   }
+   return(false);
+} // EnumStructUnionParser::try_pre_identify_type
+
+
+bool EnumStructUnionParser::type_identified() const
+{
+   LOG_FUNC_ENTRY();
+
+   return(m_type != nullptr);
+} // EnumStructUnionParser::type_identified
+
+
+/**
+ * Returns true if a where clause was detected during parsing
+ */
+bool EnumStructUnionParser::where_clause_detected() const
+{
+   LOG_FUNC_ENTRY();
+
+   auto *where_end   = get_where_end();
+   auto *where_start = get_where_start();
+
+   return(  where_end != nullptr
+         && where_start != nullptr);
+} // EnumStructUnionParser::where_clause_detected
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.h
new file mode 100644
index 00000000..b3062d48
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/EnumStructUnionParser.h
@@ -0,0 +1,496 @@
+/**
+ * @file combine_fix_mark_enum_struct_union.h
+ *
+ * @author
+ * @license GPL v2+
+ * extract from combine_fix_mark.h
+ */
+
+#ifndef ENUM_STRUCT_UNION_PARSER_H_INCLUDED
+#define ENUM_STRUCT_UNION_PARSER_H_INCLUDED
+
+#include "pcf_flags.h"
+#include "token_enum.h"
+#include <map>
+
+
+/**
+ * Class EnumStructUnionParser : This class facilitates the parsing and interpretation
+ *                               of ALL instances of the class, enum, union, and
+ *                               struct keywords, including user-defined types with
+ *                               a body {} and any trailing inline variable declarations
+ *                               that may follow the definition (as permitted by
+ *                               the coding language in question). The class also
+ *                               interprets variable declarations preceded by one
+ *                               of those keywords, as well as any C/C++ forward
+ *                               declarations
+ */
+class EnumStructUnionParser
+{
+public:
+   /**
+    * Constructor
+    */
+   EnumStructUnionParser();
+
+
+   /**
+    * Destructor
+    */
+   ~EnumStructUnionParser();
+
+
+private:
+   /**
+    * Analyzes all identifiers (marked as CT_WORD) between the starting and
+    * ending chunks and changes CT_WORD to one of CT_TYPE, CT_MACRO_FUNC_CALL,
+    * etc. and sets flags (PCF_VAR_1ST, PCF_VAR_1ST_DEF, PCF_VAR_INLINE, etc.)
+    * for variable identifiers accordingly. Flags C++ forward declarations as
+    * PCF_INCOMPLETE
+    */
+   void analyze_identifiers();
+
+
+   /**
+    * Returns true if a pair of braces were both detected AND determined to be
+    * part of a class/enum/struct/union body
+    */
+   bool body_detected() const;
+
+
+   /**
+    * Returns true if comma-separated values were detected during parsing
+    */
+   bool comma_separated_values_detected() const;
+
+
+   /**
+    * Returns true if an enumerated integral type was detected during parsing
+    */
+   bool enum_base_detected() const;
+
+
+   /**
+    * Returns the end chunk of a class/enum/struct/union body, if detected
+    * during parsing
+    */
+   struct chunk_t *get_body_end() const;
+
+
+   /**
+    * Returns the starting chunk of a class/enum/struct/union body, if detected
+    * during parsing
+    */
+   struct chunk_t *get_body_start() const;
+
+
+   /**
+    * Returns the starting chunk associated with an enumerated type's base
+    * specifier statement, if detected during parsing
+    */
+   struct chunk_t *get_enum_base_start() const;
+
+
+   /**
+    * Returns the first comma encountered at the level of the starting chunk,
+    * if detected during parsing
+    */
+   struct chunk_t *get_first_top_level_comma() const;
+
+
+   /**
+    * Returns the ending chunk associated with an class/struct inheritance
+    * list, if detected during parsing
+    */
+   struct chunk_t *get_inheritance_end() const;
+
+
+   /**
+    * Returns the starting chunk associated with an class/struct inheritance
+    * list, if detected during parsing
+    */
+   struct chunk_t *get_inheritance_start() const;
+
+
+   /**
+    * Returns a numerically-indexed map of all question operators encountered
+    * during parsing
+    */
+   std::map<std::size_t, struct chunk_t *> get_question_operators() const;
+
+
+   /**
+    * Returns the end chunk associated with a template parameter list, if
+    * detected during parsing
+    */
+   struct chunk_t *get_template_end() const;
+
+
+   /**
+    * Return the starting chunk associated with a template parameter list, if
+    * detected during parsing
+    */
+   struct chunk_t *get_template_start() const;
+
+
+   /**
+    * Returns a numerically-indexed map of all top-level commas encountered
+    * during parsing
+    */
+   std::map<std::size_t, struct chunk_t *> get_top_level_commas() const;
+
+
+   /**
+    * Return the starting chunk associated with a where clause, if
+    * detected during parsing
+    */
+   struct chunk_t *get_where_end() const;
+
+
+   /**
+    * Return the starting chunk associated with a where clause, if
+    * detected during parsing
+    */
+   struct chunk_t *get_where_start() const;
+
+
+   /**
+    * Returns true if an inheritance list associated with a class or struct was
+    * discovered during parsing
+    */
+   bool inheritance_detected() const;
+
+
+public:
+   /**
+    * Performs object initialization prior to parsing
+    */
+   void initialize(struct chunk_t *pc);
+
+
+private:
+   /**
+    * Returns true if the chunk under test represents a potential end chunk past
+    * which further parsing is not likely warranted
+    */
+   bool is_potential_end_chunk(struct chunk_t *pc) const;
+
+
+   /**
+    * Returns true if the chunk under test is deemed to be located within a
+    * conditional/ternary statement
+    */
+   bool is_within_conditional(struct chunk_t *pc) const;
+
+
+   /**
+    * Returns true if the chunk under test is deemed to be located within an
+    * inheritance list
+    */
+   bool is_within_inheritance_list(struct chunk_t *pc) const;
+
+
+   /**
+    * Returns true if the chunk under test is deemed to be located within a
+    * where clause
+    */
+   bool is_within_where_clause(struct chunk_t *pc) const;
+
+
+   /**
+    * Marks all base classes that appear as part of an inheritance list
+    */
+   void mark_base_classes(struct chunk_t *pc);
+
+
+   /**
+    * Marks pairs of braces associated with the body of a class/enum/struct/union,
+    * and additionally calls a separate routine to mark any base classes for that
+    * may precede the opening brace
+    */
+   void mark_braces(struct chunk_t *start);
+
+
+   /**
+    * Marks the beginning chunk of an inheritance list
+    */
+   void mark_class_colon(struct chunk_t *colon);
+
+
+   /**
+    * Mark a colon as a conditional
+    */
+   void mark_conditional_colon(struct chunk_t *colon);
+
+
+   /**
+    * Mark any struct/class constructor declarations/definitions
+    */
+   void mark_constructors();
+
+
+   /**
+    * Marks the beginning chunk of an enumerated integral type specification
+    */
+   void mark_enum_integral_type(struct chunk_t *colon);
+
+
+   /**
+    * Scan chunks outside the definition body and mark lvalues accordingly
+    */
+   void mark_extracorporeal_lvalues();
+
+
+   /**
+    * Mark nested name specifiers preceding qualified identifiers
+    */
+   void mark_nested_name_specifiers(struct chunk_t *pc);
+
+
+   /**
+    * Marks pointer operators preceding a variable identifier
+    */
+   void mark_pointer_types(struct chunk_t *pc);
+
+
+   /**
+    * Marks the beginning and ending chunks associated with a template
+    * (templates may appear after the identifier type name as part of a class
+    * specialization)
+    */
+   void mark_template(struct chunk_t *start) const;
+
+
+   /**
+    * Marks the arguments within a template argument list bounded by the
+    * starting and ending chunks
+    */
+   void mark_template_args(struct chunk_t *start, struct chunk_t *end) const;
+
+
+   /**
+    * Marks the type identifier associated with the class/enum/struct/union,
+    * if not anonymously defined
+    */
+   void mark_type(struct chunk_t *pc);
+
+
+   /**
+    * Marks all variable identifiers associated with the class/enum/struct/union
+    */
+   void mark_variable(struct chunk_t *variable, pcf_flags_t flags);
+
+
+   /**
+    * Marks all chunks belonging to a c# where clause
+    */
+   void mark_where_clause(struct chunk_t *where);
+
+
+   /**
+    * Marks the beginning of a where clause
+    */
+   void mark_where_colon(struct chunk_t *colon);
+
+
+public:
+   /**
+    * Parses the class/enum/struct/union and all associated chunks
+    */
+   void parse(struct chunk_t *pc);
+
+
+private:
+   /**
+    * Parses closing and opening angle brackets
+    */
+   struct chunk_t *parse_angles(struct chunk_t *angle_open);
+
+
+   /**
+    * Parses closing and opening braces
+    */
+   struct chunk_t *parse_braces(struct chunk_t *brace_open);
+
+
+   /**
+    * Parses a single colon, which may precede an inheritance list or
+    * enumerated integral type specification
+    */
+   void parse_colon(struct chunk_t *colon);
+
+
+   /**
+    * Parses a double colon, which may indicate a scope resolution chain
+    */
+   struct chunk_t *parse_double_colon(struct chunk_t *double_colon);
+
+
+   /**
+    * Returns the parsing error status
+    */
+   bool parse_error_detected() const;
+
+
+   /**
+    * Sets the parsing error status
+    */
+   void parse_error_detected(bool status);
+
+
+   /**
+    * Records all question operators encountered during parsing
+    */
+   void record_question_operator(struct chunk_t *question);
+
+
+   /**
+    * Records a comma chunk given one the following conditions are satisfied:
+    * 1) it is encountered at the level of the starting chunk
+    * 2) it is not part of a right-hand side assignment
+    * 3) it is not part of an inheritance list
+    * 4) it is not part of a conditional/ternary expression
+    */
+   void record_top_level_comma(struct chunk_t *comma);
+
+
+   /**
+    * Adjusts the end chunk returned by the try_find_end_chunk() function
+    * for any potential trailing inline variable declarations that may follow
+    * the body of a class/enum/struct/union definition
+    */
+   struct chunk_t *refine_end_chunk(struct chunk_t *pc);
+
+
+   /**
+    * Sets the chunk associated with the end of a class/enum/struct/union
+    * body
+    */
+   void set_body_end(struct chunk_t *body_end);
+
+
+   /**
+    * Sets the chunk associated with the start of a class/enum/struct/union
+    * body
+    */
+   void set_body_start(struct chunk_t *body_start);
+
+
+   /**
+    * Sets the chunk associated with the start of an enumerated integral
+    * base type specification
+    */
+   void set_enum_base_start(struct chunk_t *enum_base_start);
+
+
+   /**
+    * Sets the chunk associated with the start of an inheritance list
+    */
+   void set_inheritance_start(struct chunk_t *inheritance_start);
+
+
+   /**
+    * Sets the chunk associated with the end of a template
+    */
+   void set_template_end(struct chunk_t *template_end);
+
+
+   /**
+    * Sets the chunk associated with the start of a template
+    */
+   void set_template_start(struct chunk_t *template_start);
+
+
+   /**
+    * Return the ending chunk associated with a where clause, if
+    * detected during parsing
+    */
+   void set_where_end(struct chunk_t *where_end);
+
+
+   /**
+    * Return the starting chunk associated with a where clause, if
+    * detected during parsing
+    */
+   void set_where_start(struct chunk_t *where_start);
+
+
+   /**
+    * Returns true if a template was detected during parsing
+    */
+   bool template_detected() const;
+
+
+   /**
+    * Attempts to find the last chunk associated with the class/enum/struct/union
+    */
+   struct chunk_t *try_find_end_chunk(struct chunk_t *pc);
+
+
+   /**
+    * Attempts to identify any function-like macro calls which may precede the
+    * actual type identifier
+    */
+   void try_post_identify_macro_calls();
+
+
+   /**
+    * Attempts to find the identifier type name (if not anonymously-defined) post
+    * variable identifier interpretation
+    */
+   void try_post_identify_type();
+
+
+   /**
+    * Attempts to find the identifier type name prior to variable identifier
+    * interpretation
+    */
+   bool try_pre_identify_type();
+
+
+   /**
+    * Returns true if a corresponding type was identified for the class/enum/struct/union
+    */
+   bool type_identified() const;
+
+
+   /**
+    * Returns true if a where clause was detected during parsing
+    */
+   bool where_clause_detected() const;
+
+
+   /**
+    * Map of token-type, chunk pairs
+    */
+   std::map<c_token_t, std::map<std::size_t, struct chunk_t *> > m_chunk_map;
+
+
+   /**
+    * Indicates the last chunk associated with the class/enum/struct/union keyword
+    */
+   struct chunk_t *m_end;
+
+
+   /**
+    * Indicates whether or not a parse error has occurred
+    */
+   bool m_parse_error;
+
+
+   /**
+    * Stores a pointer to the class/enum/struct/union keyword chunk with which the
+    * parse() routine was invoked
+    */
+   struct chunk_t *m_start;
+
+
+   /**
+    * Stores a pointer to the type identifier associated with the class/enum/struct/union,
+    * if not anonymously defined
+    */
+   struct chunk_t *m_type;
+};
+
+
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ListManager.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ListManager.h
index 2342fd93..1b45c2a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ListManager.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ListManager.h
@@ -136,7 +136,8 @@ public:
    //! swap two elements of a list
    void Swap(T *obj1, T *obj2)
    {
-      if (obj1 != NULL && obj2 != NULL)
+      if (  obj1 != NULL
+         && obj2 != NULL)
       {
          if (obj1->prev == obj2)
          {
@@ -171,7 +172,8 @@ public:
     */
    void AddAfter(T *obj, T *ref)
    {
-      if (obj != NULL && ref != NULL)
+      if (  obj != NULL
+         && ref != NULL)
       {
          Pop(obj); // TODO: is this necessary?
          obj->next = ref->next;
@@ -198,7 +200,8 @@ public:
     */
    void AddBefore(T *obj, T *ref)
    {
-      if (obj != NULL && ref != NULL)
+      if (  obj != NULL
+         && ref != NULL)
       {
          Pop(obj);
          obj->next = ref;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ParseFrame.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.cpp
index c2efcd26..7ac3f66d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ParseFrame.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.cpp
@@ -10,9 +10,8 @@
 #include "ParseFrame.h"
 
 #include "uncrustify.h"
-#include "uncrustify_types.h"
-#include <stdexcept>
-#include <string>
+
+#include <stdexcept>            // to get std::logic_error
 
 
 using std::string;
@@ -112,7 +111,8 @@ const ContainerType &ParseFrame::prev(size_t idx) const
 {
    LOG_FUNC_ENTRY();
 
-   if (idx == 0 || idx >= pse.size())
+   if (  idx == 0
+      || idx >= pse.size())
    {
       throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
                              + " idx can't be zero or >= size()");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ParseFrame.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.h
index cf9161e6..cad34ab3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/ParseFrame.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/ParseFrame.h
@@ -10,11 +10,9 @@
 #ifndef SRC_PARSEFRAME_H_
 #define SRC_PARSEFRAME_H_
 
-#include "token_enum.h"
 #include "uncrustify_types.h"
 
 #include <memory>
-#include <vector>
 
 
 //! Structure for counting nested level
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/add_space_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/add_space_table.h
new file mode 100644
index 00000000..759507b9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/add_space_table.h
@@ -0,0 +1,302 @@
+// *INDENT-OFF*
+   { CT_ACCESS,                CT_TYPE                  },
+   { CT_ACCESS,                CT_WORD                  },
+   { CT_ALIGN,                 CT_PAREN_OPEN            },
+   { CT_AMP,                   CT_WORD                  },
+   { CT_ANGLE_CLOSE,           CT_BRACE_OPEN            },
+   { CT_ANNOTATION,            CT_ANNOTATION            },
+   { CT_ANNOTATION,            CT_TYPE                  },
+   { CT_ASM_COLON,             CT_ASM_COLON             },
+   { CT_ASM_COLON,             CT_STRING                },
+   { CT_ASM,                   CT_FUNC_CALL             },
+   { CT_ASM,                   CT_PAREN_OPEN            },
+   { CT_ASM,                   CT_QUALIFIER             },
+   { CT_ASSERT,                CT_PAREN_OPEN            },
+   { CT_ASSIGN_FUNC_PROTO,     CT_DEFAULT               },
+   { CT_ASSIGN_FUNC_PROTO,     CT_DELETE                },
+   { CT_ASSIGN_FUNC_PROTO,     CT_NUMBER                },
+   { CT_ATTRIBUTE,             CT_ATTRIBUTE             },
+   { CT_ATTRIBUTE,             CT_BRACE_OPEN            },
+   { CT_ATTRIBUTE,             CT_CASE                  },
+   { CT_ATTRIBUTE,             CT_QUALIFIER             },
+   { CT_ATTRIBUTE,             CT_TYPE                  },
+   { CT_ATTRIBUTE,             CT_WORD                  },
+   { CT_AUTORELEASEPOOL,       CT_BRACE_OPEN            },
+   { CT_BIT_COLON,             CT_NUMBER                },
+   { CT_BIT_COLON,             CT_SIZEOF                },
+   { CT_BIT_COLON,             CT_TYPE                  },
+   { CT_BIT_COLON,             CT_WORD                  },
+   { CT_BODY,                  CT_BRACE_OPEN            },
+   { CT_BRACE_CLOSE,           CT_BRACE_OPEN            },
+   { CT_BRACE_CLOSE,           CT_CLASS                 },
+   { CT_BRACE_CLOSE,           CT_FUNC_CALL             },
+   { CT_BRACE_CLOSE,           CT_GETSET                },
+   { CT_BRACE_CLOSE,           CT_IF                    },
+   { CT_BRACE_CLOSE,           CT_OC_MSG_NAME           },
+   { CT_BRACE_CLOSE,           CT_PAREN_OPEN            },
+   { CT_BRACE_CLOSE,           CT_QUALIFIER             },
+   { CT_BRACE_CLOSE,           CT_RETURN                },
+   { CT_BRACE_CLOSE,           CT_TYPE                  },
+   { CT_BRACE_CLOSE,           CT_WORD                  },
+   { CT_BREAK,                 CT_WORD                  },
+   { CT_BYREF,                 CT_INV                   },
+   { CT_CASE_COLON,            CT_ATTRIBUTE             },
+   { CT_CASE_COLON,            CT_BRACE_OPEN            },
+   { CT_CASE_COLON,            CT_BREAK                 },
+   { CT_CASE_COLON,            CT_RETURN                },
+   { CT_CASE_COLON,            CT_WORD                  },
+   { CT_CASE,                  CT_NEG                   },
+   { CT_CASE,                  CT_PAREN_OPEN            },
+   { CT_CASE,                  CT_STRING                },
+   { CT_CASE_ELLIPSIS,         CT_NUMBER                },
+   { CT_CATCH,                 CT_FUNC_CALL             },
+   { CT_CLASS_COLON,           CT_FUNC_CALL             },
+   { CT_CLASS_COLON,           CT_QUALIFIER             },
+   { CT_CLASS_COLON,           CT_TYPE                  },
+   { CT_CLASS_COLON,           CT_WORD                  },
+   { CT_COLON,                 CT_COLON                 },
+   { CT_COLON,                 CT_NUMBER                },
+   { CT_COLON,                 CT_QUALIFIER             },
+   { CT_COLON,                 CT_STRING                },
+   { CT_COLON,                 CT_TYPE                  },
+   { CT_COLON,                 CT_WORD                  },
+   { CT_COMMENT_EMBED,         CT_FUNC_CLASS_PROTO      },
+   { CT_COMMENT_MULTI,         CT_ELSE                  },
+   { CT_CONCAT,                CT_STRING                },
+   { CT_CONCAT,                CT_WORD                  },
+   { CT_COND_COLON,            CT_FUNC_CALL             },
+   { CT_COND_COLON,            CT_STRING                },
+   { CT_COND_COLON,            CT_WORD                  },
+   { CT_CONSTR_COLON,          CT_FUNC_CALL             },
+   { CT_CONSTR_COLON,          CT_FUNC_CLASS_DEF        },
+   { CT_CONSTR_COLON,          CT_FUNC_CTOR_VAR         },
+   { CT_CONSTRUCT,             CT_TYPE                  },
+   { CT_CONTINUE,              CT_WORD                  },
+   { CT_CS_PROPERTY,           CT_BRACE_OPEN            },
+   { CT_DEFAULT,               CT_STRING                },
+   { CT_DEFAULT,               CT_WORD                  },
+   { CT_DELEGATE,              CT_BRACE_OPEN            },
+   { CT_D_MODULE,              CT_WORD                  },
+   { CT_ELLIPSIS,              CT_NUMBER                },
+   { CT_ELSE,                  CT_FOR                   },
+   { CT_ELSE,                  CT_IF                    },
+   { CT_ELSE,                  CT_PAREN_OPEN            },
+   { CT_ELSE,                  CT_WORD                  },
+   { CT_ELSEIF,                CT_CONSTEXPR             },
+   { CT_ENUM_CLASS,            CT_ATTRIBUTE             },
+   { CT_ENUM_CLASS,            CT_TYPE                  },
+   { CT_ENUM,                  CT_ATTRIBUTE             },
+   { CT_ENUM,                  CT_BIT_COLON             },
+   { CT_ENUM,                  CT_BRACE_OPEN            },
+   { CT_ENUM,                  CT_ENUM_CLASS            },
+   { CT_ENUM,                  CT_FPAREN_OPEN           },
+   { CT_ENUM,                  CT_FUNCTION              },
+   { CT_ENUM,                  CT_TYPE                  },
+   { CT_ENUM,                  CT_WORD                  },
+   { CT_EXECUTION_CONTEXT,     CT_EXECUTION_CONTEXT     },
+   { CT_EXECUTION_CONTEXT,     CT_FPAREN_OPEN           },
+   { CT_EXTERN,                CT_STRING                },
+   { CT_FPAREN_CLOSE,          CT_ASSIGN_FUNC_PROTO     },
+   { CT_FPAREN_CLOSE,          CT_ATTRIBUTE             },
+   { CT_FPAREN_CLOSE,          CT_CLASS_COLON           },
+   { CT_FPAREN_CLOSE,          CT_COND_COLON            },
+   { CT_FPAREN_CLOSE,          CT_CONSTR_COLON          },
+   { CT_FPAREN_CLOSE,          CT_DEFAULT               },
+   { CT_FPAREN_CLOSE,          CT_FUNC_CALL             },
+   { CT_FPAREN_CLOSE,          CT_NEG                   },
+   { CT_FPAREN_CLOSE,          CT_NOT                   },
+   { CT_FPAREN_CLOSE,          CT_OC_MSG_NAME           },
+   { CT_FPAREN_CLOSE,          CT_QUESTION              },
+   { CT_FPAREN_CLOSE,          CT_STRING                },
+   { CT_FPAREN_CLOSE,          CT_THROW                 },
+   { CT_FPAREN_CLOSE,          CT_TYPE                  },
+   { CT_FPAREN_CLOSE,          CT_WHERE_SPEC            },
+   { CT_FPAREN_CLOSE,          CT_WORD                  },
+   { CT_FRIEND,                CT_CLASS                 },
+   { CT_FRIEND,                CT_STRUCT                },
+   { CT_FRIEND,                CT_TYPE                  },
+   { CT_FUNCTION,              CT_PAREN_OPEN            },
+   { CT_FUNC_VAR,              CT_PPAREN_CLOSE          },
+   { CT_GOTO,                  CT_WORD                  },
+   { CT_IF,                    CT_CONSTEXPR             },
+   { CT_IMPORT,                CT_WORD                  },
+   { CT_INCDEC_AFTER,          CT_DEREF                 },
+   { CT_IN,                    CT_TYPE                  },
+   { CT_IN,                    CT_WORD                  },
+   { CT_LABEL_COLON,           CT_CS_PROPERTY           },
+   { CT_LABEL_COLON,           CT_FUNC_CALL             },
+   { CT_LABEL_COLON,           CT_NEW                   },
+   { CT_LABEL_COLON,           CT_PAREN_OPEN            },
+   { CT_LABEL_COLON,           CT_RETURN                },
+   { CT_LABEL_COLON,           CT_STRING                },
+   { CT_LABEL_COLON,           CT_TYPE                  },
+   { CT_LABEL_COLON,           CT_WORD                  },
+   { CT_LOCK,                  CT_PAREN_OPEN            },
+   { CT_NAMESPACE,             CT_BRACE_OPEN            },
+   { CT_NAMESPACE,             CT_TYPE                  },
+   { CT_NAMESPACE,             CT_WORD                  },
+   { CT_NATIVE,                CT_TAG                   },
+   { CT_NUMBER,                CT_CASE_ELLIPSIS         },
+   { CT_NUMBER,                CT_CHAR                  },
+   { CT_NUMBER,                CT_COLON                 },
+   { CT_NUMBER,                CT_ELLIPSIS              },
+   { CT_NUMBER,                CT_OC_MSG_NAME           },
+   { CT_NUMBER,                CT_PAREN_OPEN            },
+   { CT_NUMBER,                CT_WORD                  },
+   { CT_NUMBER_FP,             CT_NUMBER                },
+   { CT_NUMBER_FP,             CT_OC_MSG_NAME           },
+   { CT_NUMBER_FP,             CT_WORD                  },
+   { CT_OC_CLASS,              CT_CLASS_COLON           },
+   { CT_OC_CLASS,              CT_PAREN_OPEN            },
+   { CT_OC_DYNAMIC,            CT_WORD                  },
+   { CT_OC_IMPL,               CT_OC_CLASS              },
+   { CT_OC_INTF,               CT_OC_CLASS              },
+   { CT_OC_MSG_DECL,           CT_BRACE_OPEN            },
+   { CT_OC_PROTOCOL,           CT_OC_CLASS              },
+   { CT_PACKAGE,               CT_WORD                  },
+   { CT_PAREN_CLOSE,           CT_ASM_COLON             },
+   { CT_PAREN_CLOSE,           CT_COLON                 },
+   { CT_PAREN_CLOSE,           CT_COND_COLON            },
+   { CT_PAREN_CLOSE,           CT_CS_PROPERTY           },
+   { CT_PAREN_CLOSE,           CT_DEREF                 },
+   { CT_PAREN_CLOSE,           CT_NOT                   },
+   { CT_PAREN_CLOSE,           CT_NUMBER                },
+   { CT_PAREN_CLOSE,           CT_OC_MSG_NAME           },
+   { CT_PAREN_CLOSE,           CT_POS                   },
+   { CT_PAREN_CLOSE,           CT_QUALIFIER             },
+   { CT_PAREN_CLOSE,           CT_TYPE                  },
+   { CT_PP_DEFINE,             CT_MACRO                 },
+   { CT_PP_DEFINE,             CT_MACRO_FUNC            },
+   { CT_PP_DEFINE,             CT_NUMBER                },
+   { CT_PP_DEFINE,             CT_PP_IGNORE             },
+   { CT_PP_DEFINED,            CT_TYPE                  },
+   { CT_PP_DEFINED,            CT_WORD                  },
+   { CT_PP_ELSE,               CT_FUNC_CALL             },
+   { CT_PP_ELSE,               CT_NOT                   },
+   { CT_PP_ELSE,               CT_NUMBER                },
+   { CT_PP_ELSE,               CT_PAREN_OPEN            },
+   { CT_PP_ELSE,               CT_PP_DEFINED            },
+   { CT_PP_ELSE,               CT_WORD                  },
+   { CT_PP_EMIT,               CT_MACRO                 },
+   { CT_PP_ENDIF,              CT_WORD                  },
+   { CT_PP_ENDREGION,          CT_PREPROC_BODY          },
+   { CT_PP_IF,                 CT_CNG_HASINC            },
+   { CT_PP_IF,                 CT_FUNC_CALL             },
+   { CT_PP_IF,                 CT_NOT                   },
+   { CT_PP_IF,                 CT_NUMBER                },
+   { CT_PP_IF,                 CT_PAREN_OPEN            },
+   { CT_PP_IF,                 CT_PP_ASM                },
+   { CT_PP_IF,                 CT_PP_DEFINE             },
+   { CT_PP_IF,                 CT_PP_DEFINED            },
+   { CT_PP_IF,                 CT_TYPE                  },
+   { CT_PP_IF,                 CT_WORD                  },
+   { CT_PP_INCLUDE,            CT_STRING                },
+   { CT_PP_INCLUDE,            CT_WORD                  },
+   { CT_PP_OTHER,              CT_PREPROC_BODY          },
+   { CT_PP_PROPERTY,           CT_WORD                  },
+   { CT_PP_REGION,             CT_PREPROC_BODY          },
+   { CT_PP_UNDEF,              CT_TYPE                  },
+   { CT_PP_UNDEF,              CT_WORD                  },
+   { CT_Q_EMIT,                CT_FUNC_CALL             },
+   { CT_Q_FOREVER,             CT_BRACE_OPEN            },
+   { CT_QUESTION,              CT_FUNC_CALL             },
+   { CT_QUESTION,              CT_PAREN_OPEN            },
+   { CT_QUESTION,              CT_STRING                },
+   { CT_QUESTION,              CT_WORD                  },
+   { CT_SBOOL,                 CT_TYPE                  },
+   { CT_SCOMPARE,              CT_WORD                  },
+   { CT_SPAREN_CLOSE,          CT_ATTRIBUTE             },
+   { CT_SPAREN_CLOSE,          CT_AUTORELEASEPOOL       },
+   { CT_SPAREN_CLOSE,          CT_BRACE_OPEN            },
+   { CT_SPAREN_CLOSE,          CT_FUNC_CALL             },
+   { CT_SPAREN_CLOSE,          CT_WORD                  },
+   { CT_SQL_ASSIGN,            CT_FUNC_CALL             },
+   { CT_SQL_ASSIGN,            CT_WORD                  },
+   { CT_SQL_BEGIN,             CT_SQL_WORD              },
+   { CT_SQL_END,               CT_SQL_WORD              },
+   { CT_SQL_EXEC,              CT_SQL_WORD              },
+   { CT_SQL_WORD,              CT_COLON                 },
+   { CT_SQL_WORD,              CT_PAREN_OPEN            },
+   { CT_SQL_WORD,              CT_SQL_WORD              },
+   { CT_SQUARE_CLOSE,          CT_ATTRIBUTE             },
+   { CT_SQUARE_CLOSE,          CT_BRACE_OPEN            },
+   { CT_SQUARE_CLOSE,          CT_COLON                 },
+   { CT_SQUARE_CLOSE,          CT_EXECUTION_CONTEXT     },
+   { CT_SQUARE_CLOSE,          CT_OC_MSG_NAME           },
+   { CT_SQUARE_CLOSE,          CT_STRING                },
+   { CT_SQUARE_CLOSE,          CT_WORD                  },
+   { CT_STATE,                 CT_TYPE                  },
+   { CT_STOCK,                 CT_QUALIFIER             },
+   { CT_STOCK,                 CT_TAG                   },
+   { CT_STRING,                CT_ATTRIBUTE             },
+   { CT_STRING,                CT_BRACE_OPEN            },
+   { CT_STRING,                CT_COLON                 },
+   { CT_STRING,                CT_CONCAT                },
+   { CT_STRING,                CT_OC_MSG_NAME           },
+   { CT_STRING,                CT_PAREN_OPEN            },
+   { CT_STRING,                CT_STRING                },
+   { CT_STRING,                CT_STRUCT                },
+   { CT_STRING,                CT_TYPE                  },
+   { CT_STRING,                CT_WORD                  },
+   { CT_STRUCT,                CT_BRACE_OPEN            },
+   { CT_STRUCT,                CT_CLASS_COLON           },
+   { CT_STRUCT,                CT_MACRO_FUNC_CALL       },
+   { CT_STRUCT,                CT_TYPE                  },
+   { CT_STRUCT,                CT_WORD                  },
+   { CT_TEMPLATE,              CT_CLASS                 },
+   { CT_TEMPLATE,              CT_TYPE                  },
+   { CT_THIS,                  CT_OC_MSG_NAME           },
+   { CT_THIS,                  CT_TYPE                  },
+   { CT_TSQUARE,               CT_BRACE_OPEN            },
+   { CT_TSQUARE,               CT_PAREN_OPEN            },
+   { CT_TSQUARE,               CT_WORD                  },
+   { CT_TYPEDEF,               CT_ENUM                  },
+   { CT_TYPEDEF,               CT_FUNC_TYPE             },
+   { CT_TYPEDEF,               CT_PAREN_OPEN            },
+   { CT_TYPEDEF,               CT_QUALIFIER             },
+   { CT_TYPEDEF,               CT_STRUCT                },
+   { CT_TYPEDEF,               CT_TYPE                  },
+   { CT_TYPEDEF,               CT_TYPENAME              },
+   { CT_TYPEDEF,               CT_UNION                 },
+   { CT_TYPENAME,              CT_ELLIPSIS              },
+   { CT_TYPENAME,              CT_WORD                  },
+   { CT_UNION,                 CT_BRACE_OPEN            },
+   { CT_UNION,                 CT_TYPE                  },
+   { CT_UNION,                 CT_WORD                  },
+   { CT_USING,                 CT_NAMESPACE             },
+   { CT_USING,                 CT_TYPE                  },
+   { CT_USING,                 CT_WORD                  },
+   { CT_USING_STMT,            CT_PAREN_OPEN            },
+   { CT_VOLATILE,              CT_BRACE_OPEN            },
+   { CT_WHERE_COLON,           CT_CS_PROPERTY           },
+   { CT_WHERE_COLON,           CT_NEW                   },
+   { CT_WHERE_COLON,           CT_TYPE                  },
+   { CT_WHERE_COLON,           CT_WORD                  },
+   { CT_WHERE_SPEC,            CT_WORD                  },
+   { CT_WORD,                  CT_ATTRIBUTE             },
+   { CT_WORD,                  CT_BIT_COLON             },
+   { CT_WORD,                  CT_BRACE_OPEN            },
+   { CT_WORD,                  CT_CLASS_COLON           },
+   { CT_WORD,                  CT_COLON                 },
+   { CT_WORD,                  CT_COMMENT_CPP           },
+   { CT_WORD,                  CT_CONCAT                },
+   { CT_WORD,                  CT_ELLIPSIS              },
+   { CT_WORD,                  CT_IN                    },
+   { CT_WORD,                  CT_NEW                   },
+   { CT_WORD,                  CT_NOT                   },
+   { CT_WORD,                  CT_NUMBER                },
+   { CT_WORD,                  CT_NUMBER_FP             },
+   { CT_WORD,                  CT_OPERATOR              },
+   { CT_WORD,                  CT_QUALIFIER             },
+   { CT_WORD,                  CT_QUESTION              },
+   { CT_WORD,                  CT_SCOMPARE              },
+   { CT_WORD,                  CT_SQL_ASSIGN            },
+   { CT_WORD,                  CT_STRING                },
+   { CT_WORD,                  CT_STRUCT                },
+   { CT_WORD,                  CT_TYPE                  },
+   { CT_WORD,                  CT_TYPE_CAST             },
+   { CT_WORD,                  CT_TYPEDEF               },
+   { CT_WORD,                  CT_WHERE_COLON           },
+   { CT_WORD,                  CT_WHERE_SPEC            },
+   { CT_WORD,                  CT_WORD                  },
+// *INDENT-ON*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.cpp
index 1b0b0235..09e45dc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.cpp
@@ -27,11 +27,10 @@
 #include "align_trailing_comments.h"
 #include "align_typedefs.h"
 #include "align_var_def_brace.h"
-#include "language_tools.h"
 #include "log_rules.h"
 #include "quick_align_again.h"
-#include "uncrustify.h"
 
+constexpr static auto LCURRENT = LALIGN;
 
 using namespace uncrustify;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.h
index 110a2c86..110a2c86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_add.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.cpp
index f5641d79..2bd93381 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_add.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.cpp
@@ -18,7 +18,8 @@ void align_add(ChunkStack &cs, chunk_t *pc, size_t &max_col)
    size_t  min_col;
    chunk_t *prev = chunk_get_prev(pc);
 
-   if (prev == nullptr || chunk_is_newline(prev))
+   if (  prev == nullptr
+      || chunk_is_newline(prev))
    {
       min_col = 1;
       LOG_FMT(LALADD, "%s(%d): pc->orig_line=%zu, pc->col=%zu max_col=%zu min_col=%zu\n",
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_add.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.h
index 07f1efee..07f1efee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_add.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_add.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_asm_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.cpp
index 2f749b5c..1fb6c636 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_asm_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.cpp
@@ -33,7 +33,7 @@ void align_asm_colon(void)
       }
       cas.Reset();
 
-      pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
       size_t level = pc ? pc->level : 0;
       did_nl = true;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_asm_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.h
index 76cc73bb..25704404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_asm_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_asm_colon.h
@@ -6,6 +6,7 @@
  * @author  Ben Gardner
  * @license GPL v2+
  */
+
 #ifndef ALIGN_ASM_COLON_H_INCLUDED
 #define ALIGN_ASM_COLON_H_INCLUDED
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.cpp
index 45498f42..3e745bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.cpp
@@ -7,12 +7,12 @@
  * @license GPL v2+
  */
 
-#include <deque>
-
 #include "align_assign.h"
+
 #include "align_stack.h"
 #include "log_rules.h"
-#include "uncrustify.h"
+
+constexpr static auto LCURRENT = LALASS;
 
 using namespace uncrustify;
 
@@ -29,8 +29,10 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
    }
    size_t my_level = first->level;
 
+   char   copy[1000];
+
    LOG_FMT(LALASS, "%s(%d): [my_level is %zu]: start checking with '%s', on orig_line %zu, span is %zu, thresh is %zu\n",
-           __func__, __LINE__, my_level, first->text(), first->orig_line, span, thresh);
+           __func__, __LINE__, my_level, first->elided_text(copy), first->orig_line, span, thresh);
 
    // If we are aligning on a tabstop, we shouldn't right-align
    AlignStack as;    // regular assigns
@@ -63,7 +65,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
    while (pc != nullptr)
    {
       LOG_FMT(LALASS, "%s(%d): orig_line is %zu, check pc->text() '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->text(), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
+              __func__, __LINE__, pc->orig_line, pc->elided_text(copy), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
 
       // Don't check inside SPAREN, PAREN or SQUARE groups
       if (  chunk_is_token(pc, CT_SPAREN_OPEN)
@@ -96,7 +98,8 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
       }
 
       // Recurse if a brace set is found
-      if (chunk_is_token(pc, CT_BRACE_OPEN) || chunk_is_token(pc, CT_VBRACE_OPEN))
+      if (  chunk_is_token(pc, CT_BRACE_OPEN)
+         || chunk_is_token(pc, CT_VBRACE_OPEN))
       {
          size_t myspan;
          size_t mythresh;
@@ -117,7 +120,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
             log_rule_B("align_assign_thresh");
             mythresh = options::align_assign_thresh();
          }
-         pc = align_assign(chunk_get_next_ncnl(pc), myspan, mythresh, &sub_nl_count);
+         pc = align_assign(chunk_get_next_ncnnl(pc), myspan, mythresh, &sub_nl_count);
 
          if (sub_nl_count > 0)
          {
@@ -141,7 +144,8 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
       }
 
       // Done with this brace set?
-      if (chunk_is_token(pc, CT_BRACE_CLOSE) || chunk_is_token(pc, CT_VBRACE_CLOSE))
+      if (  chunk_is_token(pc, CT_BRACE_CLOSE)
+         || chunk_is_token(pc, CT_VBRACE_CLOSE))
       {
          pc = chunk_get_next(pc);
          break;
@@ -172,8 +176,9 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
               && !pc->flags.test(PCF_IN_FCN_DEF)    // Issue #1717
               && !pc->flags.test(PCF_IN_FCN_CALL))  // Issue #1717
       {
-         LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags:\n   ", __func__, __LINE__);
-         log_pcf_flags(LALASS, pc->flags);
+         // produces much more log output. Use it only debugging purpose
+         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags:\n   ", __func__, __LINE__);
+         //log_pcf_flags(LALASS, pc->flags);
          var_def_cnt++;
       }
       else if (var_def_cnt > 1)
@@ -193,8 +198,9 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
          }
          LOG_FMT(LALASS, "%s(%d): align_assign_decl_func() is %d\n",
                  __func__, __LINE__, options::align_assign_decl_func());
-         LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags: ", __func__, __LINE__);
-         log_pcf_flags(LALASS, pc->flags);
+         // produces much more log output. Use it only debugging purpose
+         //LOG_FMT(LALASS, "%s(%d): log_pcf_flags pc->flags: ", __func__, __LINE__);
+         //log_pcf_flags(LALASS, pc->flags);
 
          log_rule_B("align_assign_decl_func");
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_assign.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.h
index e14ad62c..e14ad62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_assign.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_assign.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_eigen_comma_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.cpp
index 2dbd8271..c659c214 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_eigen_comma_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.cpp
@@ -11,11 +11,10 @@
 #include "align_eigen_comma_init.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
-#include "ChunkStack.h"
 #include "indent.h"
 #include "log_rules.h"
-#include "uncrustify.h"
+
+constexpr static auto LCURRENT = LALIGN;
 
 using namespace uncrustify;
 
@@ -35,11 +34,11 @@ void align_eigen_comma_init(void)
    {
       if (chunk_is_newline(pc))
       {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
+         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
       }
       else
       {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n",
+         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n",
                  __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
       }
 
@@ -54,13 +53,15 @@ void align_eigen_comma_init(void)
       {
          as.NewLines(pc->nl_count);
       }
-      else if (start != nullptr && pc->level < start->level)
+      else if (  start != nullptr
+              && pc->level < start->level)
       {
          // A drop in level restarts the aligning
          as.Flush();
          start = nullptr;
       }
-      else if (start != nullptr && pc->level > start->level)
+      else if (  start != nullptr
+              && pc->level > start->level)
       {
          // Ignore any deeper levels when aligning
       }
@@ -89,7 +90,8 @@ void align_eigen_comma_init(void)
              */
             chunk_t *prev = chunk_get_prev(pc);
 
-            if (prev != nullptr && chunk_is_newline(prev))
+            if (  prev != nullptr
+               && chunk_is_newline(prev))
             {
                log_rule_B("indent_columns");
                indent_to_column(pc, pc->column_indent + options::indent_columns());
@@ -107,7 +109,7 @@ void align_eigen_comma_init(void)
          auto *const prev = chunk_get_prev(pc);
 
          if (  chunk_is_newline(prev)
-            && chunk_is_token(chunk_get_prev_ncnl(pc), CT_COMMA))
+            && chunk_is_token(chunk_get_prev_ncnnl(pc), CT_COMMA))
          {
             log_rule_B("align_eigen_comma_init");
             as.Add(pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_eigen_comma_init.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.h
index 8f8ce34b..8f8ce34b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_eigen_comma_init.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_eigen_comma_init.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.cpp
index f5521164..41990576 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.cpp
@@ -8,11 +8,14 @@
  */
 
 #include "align_func_params.h"
+
 #include "align_stack.h"
 #include "log_rules.h"
 
 #include <algorithm>                           // to get max
 
+constexpr static auto LCURRENT = LALIGN;
+
 using namespace uncrustify;
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.h
index b200a0cb..b200a0cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_params.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.cpp
new file mode 100644
index 00000000..2a96b865
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.cpp
@@ -0,0 +1,218 @@
+/**
+ * @file align_func_proto.cpp
+ *
+ * @author  Guy Maurel
+ * split from align.cpp
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#include "align_func_proto.h"
+
+#include "align_stack.h"
+#include "align_tools.h"
+#include "log_rules.h"
+
+#include <algorithm>                           // to get max
+
+constexpr static auto LCURRENT = LALPROTO;
+
+using namespace uncrustify;
+
+
+void align_func_proto(size_t span)
+{
+   LOG_FUNC_ENTRY();
+
+   size_t myspan   = span;
+   size_t mythresh = 0;
+
+   log_rule_B("align_func_proto_gap");
+   size_t mygap = options::align_func_proto_gap();
+
+   log_rule_B("align_func_proto_thresh");
+   mythresh = options::align_func_proto_thresh();
+
+   // Issue #2771
+   // we align token-1 and token-2 if:
+   //   token-1->level == token-2->level
+   //   and
+   //   token-1->brace_level == token-2->brace_level
+   // we don't check if token-1 and token-2 are in the same block
+
+   log_rule_B("align_var_def_star_style");
+   size_t mystar_style = options::align_var_def_star_style();
+
+   log_rule_B("align_var_def_amp_style");
+   size_t myamp_style = options::align_var_def_amp_style();
+
+
+   size_t     num_of_column     = 1;
+   size_t     num_of_row        = 1;
+   AlignStack *stack_init_value = nullptr;
+
+
+   // Issue #2984
+   vector<vector<AlignStack *> > many_as;
+   // Issue #2771
+   vector<vector<AlignStack *> > many_as_brace;
+
+   // init the vector ...
+   many_as.resize(num_of_column, vector<AlignStack *>(num_of_row, stack_init_value));
+   many_as_brace.resize(num_of_column, vector<AlignStack *>(num_of_row, stack_init_value));
+
+   log_rule_B("align_single_line_brace_gap");
+   size_t mybr_gap = options::align_single_line_brace_gap();
+
+
+   bool    look_bro = false;
+   chunk_t *toadd;
+
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   {
+      char copy[1000];
+      LOG_FMT(LAS, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, level is %zu, brace_level is %zu\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy),
+              get_token_name(pc->type), pc->level, pc->brace_level);
+
+      // make the vector larger if necessary
+      if (  pc->level >= num_of_column                             // Issue #2960
+         || pc->brace_level >= num_of_row)
+      {
+         num_of_column = pc->level + 1;
+         num_of_row    = pc->brace_level + 1;
+
+         many_as.resize(num_of_column);
+         many_as_brace.resize(num_of_column);
+
+         for (size_t i = 0; i < num_of_column; ++i)
+         {
+            many_as[i].resize(num_of_row);
+            many_as_brace[i].resize(num_of_row);
+         }
+      }
+
+      if (  chunk_is_newline(pc)
+         && !pc->flags.test(PCF_IN_FCN_CALL))                 // Issue #2831
+      {
+         look_bro = false;
+         AlignStack *stack_at_l_bl = many_as.at(pc->level).at(pc->brace_level);
+
+         if (stack_at_l_bl == nullptr)
+         {
+            // get a Stack
+            stack_at_l_bl = new AlignStack();
+            // start it
+            stack_at_l_bl->Start(myspan, mythresh);
+            stack_at_l_bl->m_gap        = mygap;
+            stack_at_l_bl->m_star_style = static_cast<AlignStack::StarStyle>(mystar_style);
+            stack_at_l_bl->m_amp_style  = static_cast<AlignStack::StarStyle>(myamp_style);
+            // store
+            many_as.at(pc->level).at(pc->brace_level) = stack_at_l_bl;
+         }
+         stack_at_l_bl->Debug();
+
+         for (size_t idx = 0; idx < num_of_column; idx++)
+         {
+            for (size_t idx_brace = 0; idx_brace < num_of_row; idx_brace++)
+            {
+               stack_at_l_bl = many_as.at(idx).at(idx_brace);
+
+               if (stack_at_l_bl != nullptr)
+               {
+                  stack_at_l_bl->NewLines(pc->nl_count);
+               }
+            }
+         }
+
+         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->level).at(pc->brace_level);
+
+         if (stack_at_l_bl_brace == nullptr)
+         {
+            // get a Stack
+            stack_at_l_bl_brace = new AlignStack();
+            // start it
+            stack_at_l_bl_brace->Start(myspan, mythresh);
+            stack_at_l_bl_brace->m_gap = mybr_gap;
+            // store
+            many_as_brace.at(pc->level).at(pc->brace_level) = stack_at_l_bl_brace;
+         }
+         stack_at_l_bl_brace->Debug();
+         stack_at_l_bl_brace->NewLines(pc->nl_count);
+      }
+      else if (  chunk_is_token(pc, CT_FUNC_PROTO)
+              || (  chunk_is_token(pc, CT_FUNC_DEF)
+                 && options::align_single_line_func()))
+      {
+         log_rule_B("align_single_line_func");
+         log_rule_B("align_on_operator");
+
+         if (  get_chunk_parent_type(pc) == CT_OPERATOR
+            && options::align_on_operator())
+         {
+            toadd = chunk_get_prev_ncnnl(pc);
+         }
+         else
+         {
+            toadd = pc;
+         }
+         chunk_t *tmp = step_back_over_member(toadd);
+         LOG_FMT(LAS, "%s(%d): tmp->text() is '%s', orig_line is %zu, orig_col is %zu, level is %zu, brace_level is %zu\n",
+                 __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col,
+                 tmp->level, tmp->brace_level);
+         // test the Stack
+         AlignStack *stack_at_l_bl = many_as.at(pc->level).at(pc->brace_level);
+
+         if (stack_at_l_bl == nullptr)
+         {
+            // get a Stack
+            stack_at_l_bl = new AlignStack();
+            // start it
+            stack_at_l_bl->Start(myspan, mythresh);
+            stack_at_l_bl->m_gap        = mygap;
+            stack_at_l_bl->m_star_style = static_cast<AlignStack::StarStyle>(mystar_style);
+            stack_at_l_bl->m_amp_style  = static_cast<AlignStack::StarStyle>(myamp_style);
+            // store
+            many_as.at(pc->level).at(pc->brace_level) = stack_at_l_bl;
+         }
+         stack_at_l_bl->Add(tmp);
+         log_rule_B("align_single_line_brace");
+         look_bro = (chunk_is_token(pc, CT_FUNC_DEF))
+                    && options::align_single_line_brace();
+      }
+      else if (  look_bro
+              && chunk_is_token(pc, CT_BRACE_OPEN)
+              && pc->flags.test(PCF_ONE_LINER))
+      {
+         AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->level).at(pc->brace_level);
+         stack_at_l_bl_brace->Add(pc);
+         look_bro = false;
+      }
+   }
+
+   LOG_FMT(LAS, "%s(%d):  as\n", __func__, __LINE__);
+
+   // purge
+   for (size_t idx = 0; idx < num_of_column; idx++)
+   {
+      for (size_t idx_brace = 0; idx_brace < num_of_row; idx_brace++)
+      {
+         AlignStack *stack_at_l_bl = many_as.at(idx).at(idx_brace);
+
+         if (stack_at_l_bl != nullptr)
+         {
+            stack_at_l_bl->End();
+            delete stack_at_l_bl;
+            stack_at_l_bl = nullptr;
+         }
+         AlignStack *stack_at_l_bl_brace = many_as_brace.at(idx).at(idx_brace);
+
+         if (stack_at_l_bl_brace != nullptr)
+         {
+            stack_at_l_bl_brace->End();
+            delete stack_at_l_bl_brace;
+            stack_at_l_bl_brace = nullptr;
+         }
+      }
+   }
+} // align_func_proto
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_proto.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.h
index 0edf442d..0edf442d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_func_proto.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_func_proto.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_init_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.cpp
index e444c37b..2fbe59d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_init_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.cpp
@@ -8,13 +8,14 @@
  */
 
 #include "align_init_brace.h"
+
 #include "align_log_al.h"
 #include "align_tab_column.h"
 #include "align_tools.h"
-#include "chunk_list.h"
 #include "indent.h"
 #include "log_rules.h"
-#include "uncrustify.h"
+
+constexpr static auto LCURRENT = LALBR;
 
 using namespace uncrustify;
 
@@ -31,7 +32,7 @@ void align_init_brace(chunk_t *start)
    LOG_FMT(LALBR, "%s(%d): start @ orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, start->orig_line, start->orig_col);
 
-   chunk_t *pc       = chunk_get_next_ncnl(start);
+   chunk_t *pc       = chunk_get_next_ncnnl(start);
    chunk_t *pcSingle = scan_ib_line(pc, true);
 
    if (  pcSingle == nullptr
@@ -57,7 +58,8 @@ void align_init_brace(chunk_t *start)
       {
          pc = chunk_get_next(pc);
       }
-   } while (pc != nullptr && pc->level > start->level);
+   } while (  pc != nullptr
+           && pc->level > start->level);
 
    // debug dump the current frame
    align_log_al(LALBR, start->orig_line);
@@ -77,7 +79,8 @@ void align_init_brace(chunk_t *start)
    {
       chunk_t *tmp;
 
-      if (idx == 0 && ((tmp = skip_c99_array(pc)) != nullptr))
+      if (  idx == 0
+         && ((tmp = skip_c99_array(pc)) != nullptr))
       {
          pc = tmp;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_init_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.h
index 6c0c4909..6c0c4909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_init_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_init_brace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.cpp
index d01f6b99..777f7d27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.cpp
@@ -10,11 +10,10 @@
 #include "align_left_shift.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
-#include "ChunkStack.h"
 #include "indent.h"
 #include "log_rules.h"
-#include "uncrustify.h"
+
+constexpr static auto LCURRENT = LALIGN;
 
 using namespace uncrustify;
 
@@ -34,12 +33,13 @@ void align_left_shift(void)
    {
       if (chunk_is_newline(pc))
       {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
+         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, <Newline>\n", __func__, __LINE__, pc->orig_line);
       }
       else
       {
-         LOG_FMT(LAVDB, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+         char copy[1000];
+         LOG_FMT(LALIGN, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() '%s'\n",
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
       }
 
       if (  start != nullptr
@@ -53,13 +53,15 @@ void align_left_shift(void)
       {
          as.NewLines(pc->nl_count);
       }
-      else if (start != nullptr && pc->level < start->level)
+      else if (  start != nullptr
+              && pc->level < start->level)
       {
          // A drop in level restarts the aligning
          as.Flush();
          start = nullptr;
       }
-      else if (start != nullptr && pc->level > start->level)
+      else if (  start != nullptr
+              && pc->level > start->level)
       {
          // Ignore any deeper levels when aligning
       }
@@ -88,7 +90,8 @@ void align_left_shift(void)
              */
             chunk_t *prev = chunk_get_prev(pc);
 
-            if (prev != nullptr && chunk_is_newline(prev))
+            if (  prev != nullptr
+               && chunk_is_newline(prev))
             {
                log_rule_B("indent_columns");
                indent_to_column(pc, pc->column_indent + options::indent_columns());
@@ -116,7 +119,8 @@ void align_left_shift(void)
           */
          chunk_t *prev = chunk_get_prev(pc);
 
-         if (prev != nullptr && chunk_is_newline(prev))
+         if (  prev != nullptr
+            && chunk_is_newline(prev))
          {
             log_rule_B("indent_columns");
             indent_to_column(pc, pc->column_indent + options::indent_columns());
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_left_shift.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.h
index 47d9eb81..47d9eb81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_left_shift.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_left_shift.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_log_al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.cpp
index f4f681e3..802b0280 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_log_al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "align_log_al.h"
+
 #include "uncrustify.h"
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_log_al.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.h
index 8cb2ece8..8cb2ece8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_log_al.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_log_al.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_nl_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.cpp
index 61087044..ffe17f57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_nl_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.cpp
@@ -10,7 +10,6 @@
 #include "align_nl_cont.h"
 
 #include "align_add.h"
-#include "ChunkStack.h"
 #include "uncrustify.h"
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_nl_cont.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.h
index cdef76f7..cdef76f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_nl_cont.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_nl_cont.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_decl_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.cpp
index d0d4eed9..628c9994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_decl_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.cpp
@@ -9,7 +9,6 @@
 
 #include "align_oc_decl_colon.h"
 
-#include "align_oc_msg_colons.h"
 #include "align_stack.h"
 #include "chunk_list.h"
 
@@ -42,11 +41,12 @@ void align_oc_decl_colon(void)
       cas.Reset();
 
       size_t level = pc->level;
-      pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
       did_line = false;
 
-      while (pc != nullptr && pc->level >= level)
+      while (  pc != nullptr
+            && pc->level >= level)
       {
          // The declaration ends with an open brace or semicolon
          if (  chunk_is_token(pc, CT_BRACE_OPEN)
@@ -67,7 +67,7 @@ void align_oc_decl_colon(void)
             cas.Add(pc);
 
             chunk_t *tmp  = chunk_get_prev(pc, scope_e::PREPROC);
-            chunk_t *tmp2 = chunk_get_prev_ncnl(tmp, scope_e::PREPROC);
+            chunk_t *tmp2 = chunk_get_prev_ncnnl(tmp, scope_e::PREPROC);
 
             // Check for an un-labeled parameter
             if (  (  chunk_is_token(tmp, CT_WORD)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_decl_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.h
index 370ee655..370ee655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_decl_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_decl_colon.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_colons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.cpp
index 77f0bee2..fedec9a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_colons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.cpp
@@ -6,10 +6,11 @@
  */
 
 #include "align_oc_msg_colons.h"
+
 #include "align_stack.h"
-#include "chunk_list.h"
 #include "log_rules.h"
-#include "uncrustify_types.h"
+
+constexpr static auto LCURRENT = LOCMSG;
 
 using namespace uncrustify;
 
@@ -33,14 +34,15 @@ void align_oc_msg_colon(chunk_t *so)
    cas.Start(span);
 
    size_t  level = so->level;
-   chunk_t *pc   = chunk_get_next_ncnl(so, scope_e::PREPROC);
+   chunk_t *pc   = chunk_get_next_ncnnl(so, scope_e::PREPROC);
 
    bool    did_line   = false;
    bool    has_colon  = false;
    size_t  lcnt       = 0; // line count with no colon for span
    bool    first_line = true;
 
-   while (pc != nullptr && pc->level > level)
+   while (  pc != nullptr
+         && pc->level > level)
    {
       if (pc->level > (level + 1))
       {
@@ -56,7 +58,9 @@ void align_oc_msg_colon(chunk_t *so)
 
          log_rule_B("align_oc_msg_colon_xcode_like");
 
-         if (options::align_oc_msg_colon_xcode_like() && first_line && !has_colon)
+         if (  options::align_oc_msg_colon_xcode_like()
+            && first_line
+            && !has_colon)
          {
             span = 0;
          }
@@ -72,7 +76,8 @@ void align_oc_msg_colon(chunk_t *so)
          chunk_t *tmp = chunk_get_prev(pc);
 
          if (  tmp != nullptr
-            && (chunk_is_token(tmp, CT_OC_MSG_FUNC) || chunk_is_token(tmp, CT_OC_MSG_NAME)))
+            && (  chunk_is_token(tmp, CT_OC_MSG_FUNC)
+               || chunk_is_token(tmp, CT_OC_MSG_NAME)))
          {
             nas.Add(tmp);
             chunk_flags_set(tmp, PCF_DONT_INDENT);
@@ -131,11 +136,13 @@ void align_oc_msg_colon(chunk_t *so)
    if (  longest != nullptr
       && options::indent_oc_msg_prioritize_first_colon()
       && len_diff > 0
-      && ((longest->column >= len_diff) && (longest->column - len_diff) > (longest->brace_level * indent_size)))
+      && (  (longest->column >= len_diff)
+         && (longest->column - len_diff) > (longest->brace_level * indent_size)))
    {
       longest->column -= len_diff;
    }
-   else if (longest && len > 0)
+   else if (  longest != nullptr
+           && len > 0)
    {
       chunk_t chunk;
 
@@ -166,7 +173,8 @@ void align_oc_msg_colons(void)
 
    for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
    {
-      if (chunk_is_token(pc, CT_SQUARE_OPEN) && get_chunk_parent_type(pc) == CT_OC_MSG)
+      if (  chunk_is_token(pc, CT_SQUARE_OPEN)
+         && get_chunk_parent_type(pc) == CT_OC_MSG)
       {
          align_oc_msg_colon(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_colons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.h
index 4d8ea07d..4d8ea07d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_colons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_colons.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_spec.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.cpp
index f57fa881..f57fa881 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_spec.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_spec.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.h
index b6500a6e..b6500a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_oc_msg_spec.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_oc_msg_spec.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_preprocessor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.cpp
index 08a26a94..8d54188b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_preprocessor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.cpp
@@ -9,10 +9,11 @@
 
 #include "align_preprocessor.h"
 
-#include "align_assign.h"
 #include "align_stack.h"
 #include "log_rules.h"
 
+constexpr static auto LCURRENT = LALPP;
+
 using namespace uncrustify;
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_preprocessor.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.h
index ec944587..ec944587 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_preprocessor.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_preprocessor.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_same_func_call_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.cpp
index 6cc51536..72e32337 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_same_func_call_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.cpp
@@ -10,9 +10,10 @@
 #include "align_same_func_call_params.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
 #include "log_rules.h"
 
+constexpr static auto LCURRENT = LASFCP;
+
 using namespace uncrustify;
 
 
@@ -74,7 +75,8 @@ void align_same_func_call_params(void)
          else
          {
             // if we drop below the brace level that started it, we are done
-            if (align_root && align_root->brace_level > pc->brace_level)
+            if (  align_root != nullptr
+               && align_root->brace_level > pc->brace_level)
             {
                LOG_FMT(LASFCP, "  ++ (drop) Ended with %zu fcns\n", align_len);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_same_func_call_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.h
index c7e122fc..c7e122fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_same_func_call_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_same_func_call_params.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_stack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.cpp
index 5e0d409f..c8e15bc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_stack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.cpp
@@ -11,17 +11,14 @@
 #include "align_stack.h"
 
 #include "align_tab_column.h"
-#include "chunk_list.h"
 #include "indent.h"
-#include "prototypes.h"
 #include "space.h"
-#include "uncrustify.h"
 #if defined WITH_STACKID
 #include "unc_tools.h"                   // to get stackID and get_A_Number()
 #endif
 
-#include <limits>
 
+constexpr static auto LCURRENT = LAS;
 
 using namespace uncrustify;
 
@@ -33,11 +30,12 @@ void AlignStack::Start(size_t span, int thresh)
 #if defined WITH_STACKID
    stackID = get_A_Number();   // for debugging purpose only
 #endif
-   WITH_STACKID_DEBUG;
+   // produces much more log output. Use it only debugging purpose
+   //WITH_STACKID_DEBUG;
 
-   LOG_FMT(LAS, "AlignStack::Start(%d):m_aligned.Reset()\n", __LINE__);
+   //LOG_FMT(LAS, "AlignStack::Start(%d):m_aligned.Reset()\n", __LINE__);
    m_aligned.Reset();
-   LOG_FMT(LAS, "AlignStack::Start(%d):m_skipped.Reset()\n", __LINE__);
+   //LOG_FMT(LAS, "AlignStack::Start(%d):m_skipped.Reset()\n", __LINE__);
    m_skipped.Reset();
 
    if (thresh > 0)
@@ -64,7 +62,8 @@ void AlignStack::Start(size_t span, int thresh)
 
 void AlignStack::ReAddSkipped()
 {
-   WITH_STACKID_DEBUG;
+   // produces much more log output. Use it only debugging purpose
+   //WITH_STACKID_DEBUG;
 
    if (m_skipped.Empty())
    {
@@ -72,7 +71,7 @@ void AlignStack::ReAddSkipped()
    }
    // Make a copy of the ChunkStack and clear m_skipped
    m_scratch.Set(m_skipped);
-   LOG_FMT(LAS, "AlignStack::ReAddSkipped(%d):m_skipped.Reset()\n", __LINE__);
+   //LOG_FMT(LAS, "AlignStack::ReAddSkipped(%d):m_skipped.Reset()\n", __LINE__);
    m_skipped.Reset();
 
    // Need to add them in order so that m_nl_seqnum is correct
@@ -89,7 +88,8 @@ void AlignStack::ReAddSkipped()
 
 void AlignStack::Add(chunk_t *start, size_t seqnum)
 {
-   WITH_STACKID_DEBUG;
+   // produces much more log output. Use it only debugging purpose
+   //WITH_STACKID_DEBUG;
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LAS, "AlignStack::%s(%d): Candidate is '%s': orig_line is %zu, column is %zu, type is %s, level is %zu\n",
@@ -165,7 +165,8 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
     */
    log_rule_B("align_on_tabstop");
 
-   if (options::align_on_tabstop() && m_star_style == SS_DANGLE)
+   if (  options::align_on_tabstop()
+      && m_star_style == SS_DANGLE)
    {
       m_star_style = SS_INCLUDE;
    }
@@ -175,7 +176,8 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
    chunk_t *prev = start;
 
    while (  (prev = chunk_get_prev(prev)) != nullptr
-         && (chunk_is_ptr_operator(prev) || chunk_is_token(prev, CT_TPAREN_OPEN)))
+         && (  chunk_is_ptr_operator(prev)
+            || chunk_is_token(prev, CT_TPAREN_OPEN)))
    {
       // do nothing - we want prev when this exits
    }
@@ -198,7 +200,8 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
       // back up to the first '*' or '^' preceding the token
       chunk_t *tmp_prev = chunk_get_prev(ali);
 
-      while (chunk_is_star(tmp_prev) || chunk_is_msref(tmp_prev))
+      while (  chunk_is_star(tmp_prev)
+            || chunk_is_msref(tmp_prev))
       {
          ali      = tmp_prev;
          tmp_prev = chunk_get_prev(ali);
@@ -235,7 +238,8 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
       LOG_FMT(LAS, "AlignStack::%s(%d): tmp_col is %zu\n",
               __func__, __LINE__, tmp_col);
 
-      while (tmp != nullptr && tmp != start)
+      while (  tmp != nullptr
+            && tmp != start)
       {
          chunk_t *next = chunk_get_next(tmp);
 
@@ -284,10 +288,14 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
          tmp = chunk_get_next(tmp);
       }
 
-      if (  (chunk_is_star(tmp) && m_star_style == SS_DANGLE)
-         || (chunk_is_addr(tmp) && m_amp_style == SS_DANGLE)
-         || (chunk_is_nullable(tmp) && (m_star_style == SS_DANGLE))
-         || (chunk_is_msref(tmp) && m_star_style == SS_DANGLE))  // TODO: add m_msref_style
+      if (  (  chunk_is_star(tmp)
+            && m_star_style == SS_DANGLE)
+         || (  chunk_is_addr(tmp)
+            && m_amp_style == SS_DANGLE)
+         || (  chunk_is_nullable(tmp)
+            && (m_star_style == SS_DANGLE))
+         || (  chunk_is_msref(tmp)
+            && m_star_style == SS_DANGLE)) // TODO: add m_msref_style
       {
          col_adj = start->column - ali->column;
          gap     = start->column - (ref->column + ref->len());
@@ -356,17 +364,19 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
               seqnum, m_nl_seqnum, m_seqnum,
               start->orig_line, start->column, m_max_col, m_thresh);
    }
-   WITH_STACKID_DEBUG;
+   // produces much more log output. Use it only debugging purpose
+   //WITH_STACKID_DEBUG;
 } // AlignStack::Add
 
 
 void AlignStack::NewLines(size_t cnt)
 {
-   WITH_STACKID_DEBUG;
+   // produces much more log output. Use it only debugging purpose
+   //WITH_STACKID_DEBUG;
 
    if (m_aligned.Empty())
    {
-      LOG_FMT(LAS, "AlignStack::Newlines(%d): nothing to do, is empty\n", __LINE__);
+      //LOG_FMT(LAS, "AlignStack::Newlines(%d): nothing to do, is empty\n", __LINE__);
       return;
    }
    LOG_FMT(LAS, "AlignStack::Newlines(%d): cnt is %zu\n", __LINE__, cnt);
@@ -384,7 +394,8 @@ void AlignStack::NewLines(size_t cnt)
 
 void AlignStack::Flush()
 {
-   WITH_STACKID_DEBUG;
+   // produces much more log output. Use it only debugging purpose
+   //WITH_STACKID_DEBUG;
 
    LOG_FMT(LAS, "AlignStack::%s(%d): Len() is %zu\n",
            __func__, __LINE__, Len());
@@ -413,7 +424,8 @@ void AlignStack::Flush()
    m_last_added = 0;
    m_max_col    = 0;
 
-   WITH_STACKID_DEBUG;
+   // produces much more log output. Use it only debugging purpose
+   //WITH_STACKID_DEBUG;
    LOG_FMT(LAS, "AlignStack::%s(%d): Debug the stack, Len is %zu\n",
            __func__, __LINE__, Len());
 
@@ -539,7 +551,7 @@ void AlignStack::Flush()
    if (ce != nullptr)
    {
       last_seqnum = ce->m_seqnum;
-      LOG_FMT(LAS, "AlignStack::Flush(%d):m_aligned.Reset()\n", __LINE__);
+      //LOG_FMT(LAS, "AlignStack::Flush(%d):m_aligned.Reset()\n", __LINE__);
       m_aligned.Reset();
    }
    m_min_col = numeric_limits<size_t>::max(); // use unrealistic high numbers
@@ -570,26 +582,26 @@ void AlignStack::Flush()
 
 void AlignStack::Reset()
 {
-   WITH_STACKID_DEBUG;
-   LOG_FMT(LAS, "AlignStack::Reset(%d):m_aligned.Reset()\n", __LINE__);
+   //WITH_STACKID_DEBUG;
+   //LOG_FMT(LAS, "AlignStack::Reset(%d):m_aligned.Reset()\n", __LINE__);
    m_aligned.Reset();
-   LOG_FMT(LAS, "AlignStack::Reset(%d):m_skipped.Reset()\n", __LINE__);
+   //LOG_FMT(LAS, "AlignStack::Reset(%d):m_skipped.Reset()\n", __LINE__);
    m_skipped.Reset();
 }
 
 
 void AlignStack::End()
 {
-   WITH_STACKID_DEBUG;
+   //WITH_STACKID_DEBUG;
 
    if (!m_aligned.Empty())
    {
-      LOG_FMT(LAS, "AlignStack::End(%d):\n", __LINE__);
+      //LOG_FMT(LAS, "AlignStack::End(%d):\n", __LINE__);
       Flush();
    }
-   LOG_FMT(LAS, "AlignStack::End(%d):m_aligned.Reset()\n", __LINE__);
+   //LOG_FMT(LAS, "AlignStack::End(%d):m_aligned.Reset()\n", __LINE__);
    m_aligned.Reset();
-   LOG_FMT(LAS, "AlignStack::End(%d):m_skipped.Reset()\n", __LINE__);
+   //LOG_FMT(LAS, "AlignStack::End(%d):m_skipped.Reset()\n", __LINE__);
    m_skipped.Reset();
 }
 
@@ -602,7 +614,7 @@ size_t AlignStack::Len()
 
 void AlignStack::Debug()
 {
-   WITH_STACKID_DEBUG;
+   //WITH_STACKID_DEBUG;
 
    size_t length = Len();
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_stack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.h
index d22f6320..ebd29dcc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_stack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_stack.h
@@ -154,7 +154,7 @@ protected:
    }                                                                                                        \
    else                                                                                                     \
    {                                                                                                        \
-      LOG_FMT(LAS, "AlignStack::%s(%d): stackID is %2zu\n", __func__, __LINE__, stackID);                   \
+      LOG_FMT(LAS, "AlignStack::%s(%d): stackID is %zu\n", __func__, __LINE__, stackID);                    \
    }
 #else
 #define WITH_STACKID_DEBUG    ;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_struct_initializers.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.cpp
index 53755353..95b09da0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_struct_initializers.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.cpp
@@ -20,11 +20,12 @@ void align_struct_initializers(void)
 
    while (pc != nullptr)
    {
-      chunk_t *prev = chunk_get_prev_ncnl(pc);
+      chunk_t *prev = chunk_get_prev_ncnnl(pc);
 
       if (  chunk_is_token(prev, CT_ASSIGN)
          && (  chunk_is_token(pc, CT_BRACE_OPEN)
-            || (language_is_set(LANG_D) && chunk_is_token(pc, CT_SQUARE_OPEN))))
+            || (  language_is_set(LANG_D)
+               && chunk_is_token(pc, CT_SQUARE_OPEN))))
       {
          align_init_brace(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_struct_initializers.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.h
index 1c71d5af..1c71d5af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_struct_initializers.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_struct_initializers.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tab_column.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.cpp
index 0b4d022a..8d91b0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tab_column.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.cpp
@@ -9,10 +9,9 @@
 
 #include "align_tab_column.h"
 
-#include "chunk_list.h"
-#include "log_rules.h"
 #include "prototypes.h"
-#include "uncrustify_types.h"
+
+constexpr static auto LCURRENT = LALIGN;
 
 using namespace uncrustify;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tab_column.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.h
index 9e57baa0..9e57baa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tab_column.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tab_column.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.cpp
index d8a1cc50..bd067be5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.cpp
@@ -11,7 +11,6 @@
 
 #include "space.h"
 #include "uncrustify.h"
-#include "uncrustify_limits.h"
 
 
 chunk_t *skip_c99_array(chunk_t *sq_open)
@@ -62,7 +61,8 @@ chunk_t *scan_ib_line(chunk_t *start, bool first_pass)
 
       chunk_t *next = chunk_get_next(pc);
 
-      if (next == nullptr || chunk_is_comment(next))
+      if (  next == nullptr
+         || chunk_is_comment(next))
       {
          // do nothing
       }
@@ -163,11 +163,11 @@ chunk_t *step_back_over_member(chunk_t *pc)
    chunk_t *tmp;
 
    // Skip over any class stuff: bool CFoo::bar()
-   while (  ((tmp = chunk_get_prev_ncnl(pc)) != nullptr)
+   while (  ((tmp = chunk_get_prev_ncnnl(pc)) != nullptr)
          && chunk_is_token(tmp, CT_DC_MEMBER))
    {
       // TODO: verify that we are pointing at something sane?
-      pc = chunk_get_prev_ncnl(tmp);
+      pc = chunk_get_prev_ncnnl(tmp);
    }
    return(pc);
 } // step_back_over_member
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.h
index b22c5f3f..b22c5f3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_tools.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_trailing_comments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.cpp
index 8c296886..2c94866b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_trailing_comments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.cpp
@@ -13,7 +13,8 @@
 #include "align_tab_column.h"
 #include "indent.h"
 #include "log_rules.h"
-#include "uncrustify.h"
+
+constexpr static auto LCURRENT = LALTC;
 
 using namespace uncrustify;
 
@@ -30,7 +31,8 @@ void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev)
    }
 
    if (  (cs.Len() > 1)
-      || (align_single && (cs.Len() == 1)))
+      || (  align_single
+         && (cs.Len() == 1)))
    {
       LOG_FMT(sev, "%s(%d): max_col=%zu\n", __func__, __LINE__, col);
       chunk_t *pc;
@@ -76,9 +78,11 @@ chunk_t *align_trailing_comments(chunk_t *start)
    while (  pc != nullptr
          && (nl_count < options::align_right_cmt_span()))
    {
-      if (pc->flags.test(PCF_RIGHT_COMMENT) && pc->column > 1)
+      if (  pc->flags.test(PCF_RIGHT_COMMENT)
+         && pc->column > 1)
       {
-         if (same_level && pc->brace_level != lvl)
+         if (  same_level
+            && pc->brace_level != lvl)
          {
             pc = chunk_get_prev(pc);
             break;
@@ -91,7 +95,8 @@ chunk_t *align_trailing_comments(chunk_t *start)
                     __func__, __LINE__, pc->orig_line, min_col, pc->column, pc->len(),
                     get_token_name(pc->type));
 
-            if (min_orig == 0 || min_orig > pc->column)
+            if (  min_orig == 0
+               || min_orig > pc->column)
             {
                min_orig = pc->column;
             }
@@ -110,7 +115,8 @@ chunk_t *align_trailing_comments(chunk_t *start)
    col = min_orig;
 
    // fall back to the intended column
-   if (intended_col > 0 && col > intended_col)
+   if (  intended_col > 0
+      && col > intended_col)
    {
       col = intended_col;
    }
@@ -129,7 +135,8 @@ chunk_t *align_trailing_comments(chunk_t *start)
    LOG_FMT(LALADD, "%s(%d):  -- min_orig=%zu intended_col=%zu min_allowed=%zu ==> col=%zu\n",
            __func__, __LINE__, min_orig, intended_col, min_col, col);
 
-   if (cpd.frag_cols > 0 && cpd.frag_cols <= col)
+   if (  cpd.frag_cols > 0
+      && cpd.frag_cols <= col)
    {
       col -= cpd.frag_cols;
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_trailing_comments.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.h
index a7a7b743..a7a7b743 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_trailing_comments.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_trailing_comments.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_typedefs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.cpp
index 5a5334c1..face575c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_typedefs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.cpp
@@ -10,9 +10,10 @@
 #include "align_typedefs.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
 #include "log_rules.h"
 
+constexpr static auto LCURRENT = LALTD;
+
 using namespace uncrustify;
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_typedefs.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.h
index 2902d0d2..2902d0d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_typedefs.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_typedefs.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_var_def_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.cpp
index 11476dc3..637fb054 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_var_def_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.cpp
@@ -12,7 +12,8 @@
 #include "align_stack.h"
 #include "align_tools.h"
 #include "log_rules.h"
-#include "uncrustify.h"
+
+constexpr static auto LCURRENT = LAVDB;
 
 using namespace uncrustify;
 
@@ -31,7 +32,8 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
    size_t  mygap    = 0;
 
    // Override the span, if this is a struct/union
-   if (get_chunk_parent_type(start) == CT_STRUCT || get_chunk_parent_type(start) == CT_UNION)
+   if (  get_chunk_parent_type(start) == CT_STRUCT
+      || get_chunk_parent_type(start) == CT_UNION)
    {
       log_rule_B("align_var_struct_span");
       myspan = options::align_var_struct_span();
@@ -57,7 +59,7 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
       mygap = options::align_var_def_gap();
    }
    // can't be any variable definitions in a "= {" block
-   chunk_t *prev = chunk_get_prev_ncnl(start);
+   chunk_t *prev = chunk_get_prev_ncnnl(start);
 
    if (chunk_is_token(prev, CT_ASSIGN))
    {
@@ -65,10 +67,12 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
               __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line);
 
       chunk_t *pc = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
-      return(chunk_get_next_ncnl(pc));
+      return(chunk_get_next_ncnnl(pc));
    }
+   char copy[1000];
+
    LOG_FMT(LAVDB, "%s(%d): start->text() '%s', type is %s, on orig_line %zu\n",
-           __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line);
+           __func__, __LINE__, start->elided_text(copy), get_token_name(start->type), start->orig_line);
 
    log_rule_B("align_var_def_inline");
    auto const align_mask =
@@ -111,7 +115,8 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
    chunk_t *pc       = chunk_get_next(start);
 
    while (  pc != nullptr
-         && (pc->level >= start->level || pc->level == 0))
+         && (  pc->level >= start->level
+            || pc->level == 0))
    {
       if (chunk_is_newline(pc))
       {
@@ -137,7 +142,8 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
          continue;
       }
 
-      if (fp_active && !pc->flags.test(PCF_IN_CLASS_BASE))
+      if (  fp_active
+         && !pc->flags.test(PCF_IN_CLASS_BASE))
       {
          // WARNING: Duplicate from the align_func_proto()
          log_rule_B("align_single_line_func");
@@ -156,7 +162,7 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
             if (  get_chunk_parent_type(pc) == CT_OPERATOR
                && options::align_on_operator())
             {
-               toadd = chunk_get_prev_ncnl(pc);
+               toadd = chunk_get_prev_ncnnl(pc);
             }
             else
             {
@@ -249,7 +255,8 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
          && chunk_is_not_token(pc, CT_FUNC_CLASS_PROTO)
          && ((pc->flags & align_mask) == PCF_VAR_1ST)
          && chunk_is_not_token(pc, CT_FUNC_DEF)                                   // Issue 1452
-         && ((pc->level == (start->level + 1)) || pc->level == 0)
+         && (  (pc->level == (start->level + 1))
+            || pc->level == 0)
          && pc->prev != nullptr
          && pc->prev->type != CT_MEMBER)
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_var_def_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.h
index 0cc133ea..0cc133ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/align_var_def_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/align_var_def_brace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/args.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.cpp
index 3ccc5764..4147bd91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/args.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "args.h"
+
 #include "unc_ctype.h"
 
 #include <cstring>
@@ -152,7 +153,8 @@ const char *Args::Unused(size_t &index)
 
 size_t Args::SplitLine(char *text, char *args[], size_t num_args)
 {
-   if (text == nullptr || num_args == 0)
+   if (  text == nullptr
+      || num_args == 0)
    {
       return(0);
    }
@@ -166,7 +168,8 @@ size_t Args::SplitLine(char *text, char *args[], size_t num_args)
          && *text != 0)      // end of string not reached yet
    {
       // Detect the start of an arg
-      if (!in_arg && !unc_isspace(*text))
+      if (  !in_arg
+         && !unc_isspace(*text))
       {
          in_arg     = true;
          args[argc] = dest;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/args.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.h
index 712fbd59..712fbd59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/args.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/args.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/backup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.cpp
index d09462e7..c2a9ae51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/backup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.cpp
@@ -26,15 +26,12 @@
 #include "prototypes.h"
 
 #include "backup.h"
-#include "logger.h"
 #include "md5.h"
 #include "unc_ctype.h"
-#include "uncrustify.h"
-
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
 
+#ifdef __APPLE__
+#include <cerrno>                // is needed under OSX
+#endif
 
 using namespace std;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.h
index 3e51f863..3e51f863 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/base_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/base_types.h
index 1e98b0ac..1e98b0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/base_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/base_types.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/brace_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.cpp
index 751c3e14..03ab68e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/brace_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.cpp
@@ -10,25 +10,15 @@
 
 #include "brace_cleanup.h"
 
-#include "chunk_list.h"
 #include "flag_parens.h"
 #include "frame_list.h"
-#include "indent.h"
 #include "keywords.h"
 #include "lang_pawn.h"
-#include "language_tools.h"
-#include "log_rules.h"
-#include "logger.h"
 #include "prototypes.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-#include <stdexcept>
+#include <stdexcept>            // to get std::invalid_argument
+
+constexpr static auto LCURRENT = LBC;
 
 using namespace uncrustify;
 
@@ -129,7 +119,7 @@ static size_t preproc_start(BraceState &braceState, ParseFrame &frm, chunk_t *pc
    LOG_FUNC_ENTRY();
    const size_t pp_level = braceState.pp_level;
 
-   chunk_t      *next = chunk_get_next_ncnl(pc);
+   chunk_t      *next = chunk_get_next_ncnnl(pc);
 
    if (next == nullptr)
    {
@@ -198,8 +188,12 @@ void brace_cleanup(void)
 
    while (pc != nullptr)
    {
+      LOG_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+
       // Check for leaving a #define body
-      if (braceState.in_preproc != CT_NONE && !pc->flags.test(PCF_IN_PREPROC))
+      if (  braceState.in_preproc != CT_NONE
+         && !pc->flags.test(PCF_IN_PREPROC))
       {
          if (braceState.in_preproc == CT_PP_DEFINE)
          {
@@ -212,6 +206,8 @@ void brace_cleanup(void)
       const size_t pp_level = (chunk_is_token(pc, CT_PREPROC))
                               ? preproc_start(braceState, frm, pc)
                               : braceState.pp_level;
+      LOG_FMT(LTOK, "%s(%d): pp_level is %zu\n",
+              __func__, __LINE__, pp_level);
 
       // Do before assigning stuff from the frame
       if (  language_is_set(LANG_PAWN)
@@ -244,11 +240,12 @@ void brace_cleanup(void)
          && !chunk_is_newline(pc)
          && !chunk_is_token(pc, CT_ATTRIBUTE)
          && !chunk_is_token(pc, CT_IGNORED)            // Issue #2279
-         && (braceState.in_preproc == CT_PP_DEFINE || braceState.in_preproc == CT_NONE))
+         && (  braceState.in_preproc == CT_PP_DEFINE
+            || braceState.in_preproc == CT_NONE))
       {
          braceState.consumed = false;
          parse_cleanup(braceState, frm, pc);
-         print_stack(LBCSAFTER, (chunk_is_token(pc, CT_VBRACE_CLOSE)) ? "Virt-}" : pc->str.c_str(), frm);
+         print_stack(LBCSAFTER, (chunk_is_token(pc, CT_VBRACE_CLOSE)) ? "Virt-}\n" : pc->str.c_str(), frm);
       }
       pc = chunk_get_next(pc);
    }
@@ -259,17 +256,19 @@ static bool maybe_while_of_do(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *prev = chunk_get_prev_ncnl(pc);
+   chunk_t *prev = chunk_get_prev_ncnnl(pc);
 
-   if (prev == nullptr || !prev->flags.test(PCF_IN_PREPROC))
+   if (  prev == nullptr
+      || !prev->flags.test(PCF_IN_PREPROC))
    {
       return(false);
    }
 
    // Find the chunk before the preprocessor
-   while (prev != nullptr && prev->flags.test(PCF_IN_PREPROC))
+   while (  prev != nullptr
+         && prev->flags.test(PCF_IN_PREPROC))
    {
-      prev = chunk_get_prev_ncnl(prev);
+      prev = chunk_get_prev_ncnnl(prev);
    }
 
    if (  (  chunk_is_token(prev, CT_VBRACE_CLOSE)
@@ -352,7 +351,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
    LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
            __func__, __LINE__, frm.stmt_count, frm.expr_count);
 
-   if (  (frm.stmt_count == 0 || frm.expr_count == 0)
+   if (  (  frm.stmt_count == 0
+         || frm.expr_count == 0)
       && !chunk_is_semicolon(pc)
       && chunk_is_not_token(pc, CT_BRACE_CLOSE)
       && chunk_is_not_token(pc, CT_VBRACE_CLOSE)
@@ -454,19 +454,31 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       {
          LOG_FMT(LWARN, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                  __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-         LOG_FMT(LWARN, "%s(%d): (frm.top().type + 1) is %s\n",
-                 __func__, __LINE__, get_token_name((c_token_t)(frm.top().type + 1)));
+         paren_stack_entry_t AA = frm.top();                // Issue #3055
 
-         if (  frm.top().type != CT_EOF
-            && frm.top().type != CT_PP_DEFINE)
+         if (AA.type != CT_EOF)
          {
-            LOG_FMT(LWARN, "%s(%d): File: %s, orig_line is %zu, orig_col is %zu, Error: Unexpected '%s' for '%s', which was on line %zu\n",
-                    __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, pc->orig_col,
-                    pc->text(), get_token_name(frm.top().pc->type),
-                    frm.top().pc->orig_line);
-            print_stack(LBCSPOP, "=Error  ", frm);
-            cpd.error_count++;
-            exit(EXIT_FAILURE);
+            LOG_FMT(LWARN, "%s(%d): (frm.top().type + 1) is %s\n",
+                    __func__, __LINE__, get_token_name((c_token_t)(frm.top().type + 1)));
+         }
+
+         if (pc->flags.test(PCF_IN_PREPROC))                // Issue #3113
+         {
+            // do nothing
+         }
+         else
+         {
+            if (  frm.top().type != CT_EOF
+               && frm.top().type != CT_PP_DEFINE)
+            {
+               LOG_FMT(LWARN, "%s(%d): File: %s, orig_line is %zu, orig_col is %zu, Error: Unexpected '%s' for '%s', which was on line %zu\n",
+                       __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, pc->orig_col,
+                       pc->text(), get_token_name(frm.top().pc->type),
+                       frm.top().pc->orig_line);
+               print_stack(LBCSPOP, "=Error  ", frm);
+               cpd.error_count++;
+               exit(EXIT_FAILURE);
+            }
          }
       }
       else
@@ -532,7 +544,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
           */
          if (language_is_set(LANG_PAWN))
          {
-            chunk_t *tmp = chunk_get_next_ncnl(pc);
+            chunk_t *tmp = chunk_get_next_ncnnl(pc);
 
             if (  chunk_is_not_token(tmp, CT_SEMICOLON)
                && chunk_is_not_token(tmp, CT_VSEMICOLON))
@@ -568,7 +580,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       || chunk_is_token(pc, CT_SPAREN_OPEN)
       || chunk_is_token(pc, CT_BRACE_OPEN))
    {
-      chunk_t *prev = chunk_get_prev_ncnl(pc);
+      chunk_t *prev = chunk_get_prev_ncnnl(pc);
 
       if (prev != nullptr)
       {
@@ -632,6 +644,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
                parent = CT_RETURN;
             }
             // Carry through CT_ENUM parent in NS_ENUM (type, name) {
+            // for the vim editor }
             else if (  chunk_is_token(prev, CT_FPAREN_CLOSE)
                     && language_is_set(LANG_OC)
                     && get_chunk_parent_type(prev) == CT_ENUM)
@@ -673,7 +686,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
                     __func__, __LINE__);
             chunk_t *tmp = frm.top().pc;
 
-            if (tmp != nullptr && get_chunk_parent_type(tmp) == CT_NAMESPACE)
+            if (  tmp != nullptr
+               && get_chunk_parent_type(tmp) == CT_NAMESPACE)
             {
                LOG_FMT(LBCSPOP, "%s(%d): tmp->parent_type is NAMESPACE\n",
                        __func__, __LINE__);
@@ -723,7 +737,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       }
    }
 
-   if (chunk_is_token(pc, CT_CASE))
+   if (  chunk_is_token(pc, CT_CASE)
+      || chunk_is_token(pc, CT_DEFAULT))
    {
       LOG_FMT(LBCSPOP, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu\n",
               __func__, __LINE__, pc->orig_line, pc->orig_col);
@@ -810,7 +825,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       || (  chunk_is_semicolon(pc)
          && frm.top().type != CT_PAREN_OPEN
          && frm.top().type != CT_FPAREN_OPEN
-         && frm.top().type != CT_SPAREN_OPEN))
+         && frm.top().type != CT_SPAREN_OPEN)
+      || chunk_is_token(pc, CT_MACRO))                         // Issue #2742
    {
       LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on '%s'\n",
               __func__, __LINE__, pc->orig_line, pc->text());
@@ -822,7 +838,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
    // Mark expression starts
    LOG_FMT(LSTMT, "%s(%d): Mark expression starts: orig_line is %zu, orig_col is %zu, text() is '%s'\n",
            __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-   chunk_t *tmp = chunk_get_next_ncnl(pc);
+   chunk_t *tmp = chunk_get_next_ncnnl(pc);
 
    if (  chunk_is_token(pc, CT_ARITH)
       || chunk_is_token(pc, CT_SHIFT)
@@ -856,28 +872,6 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, orig_col is %zu, reset expr on '%s'\n",
               __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
    }
-   else if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-           && !braceState.consumed
-           && braceState.in_preproc != CT_PP_DEFINE)
-   {
-      size_t file_pp_level = ifdef_over_whole_file() ? 1 : 0;
-
-      if (!cpd.unc_off_used && pc->pp_level == file_pp_level)
-      {
-         // fatal error
-         LOG_FMT(LERR, "%s(%d): Unmatched BRACE_CLOSE\n   orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col);
-
-         log_rule_B("tok_split_gte");
-
-         if (!options::tok_split_gte())
-         {
-            LOG_FMT(LERR, "%s(%d): Try the option 'tok_split_gte = true'\n",
-                    __func__, __LINE__);
-         }
-         exit(EXIT_FAILURE);
-      }
-   }
 } // parse_cleanup
 
 
@@ -885,12 +879,19 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
 {
    LOG_FUNC_ENTRY();
 
+   brace_stage_e atest = frm.top().stage;
+
+   LOG_FMT(LBCSPOP, "%s(%d): atest is %s\n",
+           __func__, __LINE__, get_brace_stage_name(atest));
+
    // Turn an optional parenthesis into either a real parenthesis or a brace
    if (frm.top().stage == brace_stage_e::OP_PAREN1)
    {
       frm.top().stage = (chunk_is_not_token(pc, CT_PAREN_OPEN))
                         ? brace_stage_e::BRACE2
                         : brace_stage_e::PAREN1;
+      LOG_FMT(LBCSPOP, "%s(%d): frm.top().stage is now %s\n",
+              __func__, __LINE__, get_brace_stage_name(frm.top().stage));
    }
 
    // Check for CT_ELSE after CT_IF
@@ -1021,9 +1022,10 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
       print_stack(LBCSPOP, "-Error  ", frm);
       cpd.error_count++;
    }
-
    // Insert a CT_VBRACE_OPEN, if needed
    // but not in a preprocessor
+   atest = frm.top().stage;
+
    if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
       && !pc->flags.test(PCF_IN_PREPROC)
       && (  (frm.top().stage == brace_stage_e::BRACE2)
@@ -1127,7 +1129,7 @@ static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState
          frm.top().stage = brace_stage_e::ELSE;
 
          // If the next chunk isn't CT_ELSE, close the statement
-         chunk_t *next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
          if (  next == nullptr
             || chunk_is_not_token(next, CT_ELSE))
@@ -1146,7 +1148,7 @@ static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState
          frm.top().stage = brace_stage_e::CATCH;
 
          // If the next chunk isn't CT_CATCH or CT_FINALLY, close the statement
-         chunk_t *next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
          if (  chunk_is_not_token(next, CT_CATCH)
             && chunk_is_not_token(next, CT_FINALLY))
@@ -1213,14 +1215,14 @@ static void mark_namespace(chunk_t *pns)
    chunk_t *br_close;
    bool    is_using = false;
 
-   chunk_t *pc = chunk_get_prev_ncnl(pns);
+   chunk_t *pc = chunk_get_prev_ncnnl(pns);
 
    if (chunk_is_token(pc, CT_USING))
    {
       is_using = true;
       set_chunk_parent(pns, CT_USING);
    }
-   pc = chunk_get_next_ncnl(pns);
+   pc = chunk_get_next_ncnnl(pns);
 
    while (pc != nullptr)
    {
@@ -1236,7 +1238,7 @@ static void mark_namespace(chunk_t *pns)
             }
             return;
          }
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
          continue;
       }
       log_rule_B("indent_namespace_limit");
@@ -1275,6 +1277,7 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
    set_chunk_parent(&chunk, frm.top().type);
    chunk.orig_line   = pc->orig_line;
    chunk.level       = frm.level;
+   chunk.pp_level    = frm.pp_level;
    chunk.brace_level = frm.brace_level;
    chunk.flags       = pc->flags & PCF_COPY_FLAGS;
    chunk.str         = "";
@@ -1297,7 +1300,8 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
       chunk.flags &= ~PCF_IN_PREPROC;
    }
 
-   while (chunk_is_newline(ref) || chunk_is_comment(ref))
+   while (  chunk_is_newline(ref)
+         || chunk_is_comment(ref))
    {
       ref->level++;
       ref->brace_level++;
@@ -1315,7 +1319,8 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
    {
       if (chunk_is_token(ref, CT_PREPROC_BODY))
       {
-         while (ref != nullptr && ref->flags.test(PCF_IN_PREPROC))
+         while (  ref != nullptr
+               && ref->flags.test(PCF_IN_PREPROC))
          {
             ref = chunk_get_prev(ref);
          }
@@ -1323,6 +1328,11 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
       else
       {
          ref = chunk_get_next(ref);
+
+         if (chunk_is_token(ref, CT_COMMENT)) // Issue #3034
+         {
+            ref = chunk_get_next_nc(ref);
+         }
       }
    }
 
@@ -1333,6 +1343,7 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
    chunk.orig_line = ref->orig_line;
    chunk.orig_col  = ref->orig_col;
    chunk.column    = ref->column + ref->len() + 1;
+   chunk.pp_level  = ref->pp_level;                         // Issue #3055
    set_chunk_type(&chunk, CT_VBRACE_OPEN);
 
    return(chunk_add_after(&chunk, ref));
@@ -1377,7 +1388,7 @@ bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
       else
       {
          // otherwise, add before it and consume the vbrace
-         vbc = chunk_get_prev_ncnl(pc);
+         vbc = chunk_get_prev_ncnnl(pc);
 
          frm.level--;
          frm.brace_level--;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/brace_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.h
index cf113417..4b2cfbba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/brace_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/brace_cleanup.h
@@ -1,10 +1,11 @@
 /**
  * @file brace_cleanup.h
- * prototypes for brace_cleanup.c
+ * prototypes for brace_cleanup.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
  */
+
 #ifndef BRACE_CLEANUP_H_INCLUDED
 #define BRACE_CLEANUP_H_INCLUDED
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.cpp
index 51842626..7b7fa293 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.cpp
@@ -8,23 +8,12 @@
 
 #include "braces.h"
 
-#include "chunk_list.h"
-#include "combine.h"
+#include "calculate_closing_brace_position.h"
 #include "combine_tools.h"
-#include "error_types.h"
-#include "language_tools.h"
-#include "log_rules.h"
 #include "newlines.h"
 #include "prototypes.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <vector>
 
+constexpr static auto LCURRENT = LBR;
 
 using namespace uncrustify;
 
@@ -170,7 +159,7 @@ void do_braces(void)
    // Issue #2232 put this at the beginning
    chunk_t *pc = chunk_get_head();
 
-   while ((pc = chunk_get_next_ncnl(pc)) != nullptr)
+   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
    {
       if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
          && chunk_is_not_token(pc, CT_VBRACE_OPEN))
@@ -180,7 +169,7 @@ void do_braces(void)
       chunk_t         *br_open = pc;
       const c_token_t brc_type = c_token_t(pc->type + 1); // corresponds to closing type
       // Detect empty bodies
-      chunk_t         *tmp = chunk_get_next_ncnl(pc);
+      chunk_t         *tmp = chunk_get_next_ncnnl(pc);
 
       if (chunk_is_token(tmp, brc_type))
       {
@@ -291,7 +280,8 @@ static void examine_braces(void)
             || (  get_chunk_parent_type(pc) == CT_WHILE
                && options::mod_full_brace_while() == IARF_REMOVE)))
       {
-         if (multiline_block && paren_multiline_before_brace(pc))
+         if (  multiline_block
+            && paren_multiline_before_brace(pc))
          {
             pc = prev;
             continue;
@@ -313,7 +303,7 @@ static bool should_add_braces(chunk_t *vbopen)
    {
       return(false);
    }
-   LOG_FMT(LBRDEL, "%s(%d): start on %zu : ",
+   LOG_FMT(LBRDEL, "%s(%d): start on %zu:\n",
            __func__, __LINE__, vbopen->orig_line);
 
    size_t  nl_count = 0;
@@ -321,7 +311,7 @@ static bool should_add_braces(chunk_t *vbopen)
    chunk_t *pc = nullptr;
 
    for (pc = chunk_get_next_nc(vbopen, scope_e::PREPROC);
-        pc != nullptr && pc->level > vbopen->level;
+        (pc != nullptr && pc->level > vbopen->level);
         pc = chunk_get_next_nc(pc, scope_e::PREPROC))
    {
       if (chunk_is_newline(pc))
@@ -353,7 +343,7 @@ static bool can_remove_braces(chunk_t *bopen)
    {
       return(false);
    }
-   chunk_t *pc = chunk_get_next_ncnl(bopen, scope_e::PREPROC);
+   chunk_t *pc = chunk_get_next_ncnnl(bopen, scope_e::PREPROC);
 
    if (chunk_is_token(pc, CT_BRACE_CLOSE))
    {
@@ -376,7 +366,8 @@ static bool can_remove_braces(chunk_t *bopen)
    LOG_FMT(LBRDEL, "%s(%d):  - begin with token '%s', orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
 
-   while (pc != nullptr && pc->level >= level)
+   while (  pc != nullptr
+         && pc->level >= level)
    {
       LOG_FMT(LBRDEL, "%s(%d): test token '%s', orig_line is %zu, orig_col is %zu\n",
               __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
@@ -391,7 +382,8 @@ static bool can_remove_braces(chunk_t *bopen)
       {
          nl_count += pc->nl_count;
 
-         if (nl_max > 0 && nl_count > nl_max)
+         if (  nl_max > 0
+            && nl_count > nl_max)
          {
             LOG_FMT(LBRDEL, "%s(%d):  exceeded %zu newlines\n",
                     __func__, __LINE__, nl_max);
@@ -423,7 +415,8 @@ static bool can_remove_braces(chunk_t *bopen)
                hit_semi = true;
             }
          }
-         else if (  (chunk_is_token(pc, CT_IF) || chunk_is_token(pc, CT_ELSEIF))
+         else if (  (  chunk_is_token(pc, CT_IF)
+                    || chunk_is_token(pc, CT_ELSEIF))
                  && br_count == 0)
          {
             if_count++;
@@ -431,7 +424,8 @@ static bool can_remove_braces(chunk_t *bopen)
 
          if (pc->level == level)
          {
-            if (semi_count > 0 && hit_semi)
+            if (  semi_count > 0
+               && hit_semi)
             {
                // should have bailed due to close brace level drop
                LOG_FMT(LBRDEL, "%s(%d):  no close brace\n", __func__, __LINE__);
@@ -481,8 +475,8 @@ static bool can_remove_braces(chunk_t *bopen)
    if (  chunk_is_token(pc, CT_BRACE_CLOSE)
       && get_chunk_parent_type(pc) == CT_IF)
    {
-      chunk_t *next     = chunk_get_next_ncnl(pc, scope_e::PREPROC);
-      chunk_t *tmp_prev = chunk_get_prev_ncnl(pc, scope_e::PREPROC);
+      chunk_t *next     = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      chunk_t *tmp_prev = chunk_get_prev_ncnnl(pc, scope_e::PREPROC);
 
       if (  chunk_is_token(next, CT_ELSE)
          && (  chunk_is_token(tmp_prev, CT_BRACE_CLOSE)
@@ -523,7 +517,8 @@ static void examine_brace(chunk_t *bopen)
 
    chunk_t      *pc = chunk_get_next_nc(bopen);
 
-   while (pc != nullptr && pc->level >= level)
+   while (  pc != nullptr
+         && pc->level >= level)
    {
       if (chunk_is_token(pc, CT_NEWLINE))
       {
@@ -547,7 +542,8 @@ static void examine_brace(chunk_t *bopen)
       {
          nl_count += pc->nl_count;
 
-         if (nl_max > 0 && nl_count > nl_max)
+         if (  nl_max > 0
+            && nl_count > nl_max)
          {
             LOG_FMT(LBRDEL, "%s(%d):  exceeded %zu newlines\n",
                     __func__, __LINE__, nl_max);
@@ -582,7 +578,7 @@ static void examine_brace(chunk_t *bopen)
 
             if (br_count == 0)
             {
-               chunk_t *next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+               chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
                if (  next == nullptr
                   || chunk_is_not_token(next, CT_BRACE_CLOSE))
@@ -603,7 +599,8 @@ static void examine_brace(chunk_t *bopen)
 
          if (pc->level == level)
          {
-            if (semi_count > 0 && hit_semi)
+            if (  semi_count > 0
+               && hit_semi)
             {
                // should have bailed due to close brace level drop
                LOG_FMT(LBRDEL, "%s(%d):  no close brace\n", __func__, __LINE__);
@@ -673,13 +670,13 @@ static void examine_brace(chunk_t *bopen)
 
    if (chunk_is_token(pc, CT_BRACE_CLOSE))
    {
-      chunk_t *next = chunk_get_next_ncnl(pc);
+      chunk_t *next = chunk_get_next_ncnnl(pc);
 
       if (next != nullptr)
       {
          while (chunk_is_token(next, CT_VBRACE_CLOSE))
          {
-            next = chunk_get_next_ncnl(next);
+            next = chunk_get_next_ncnnl(next);
          }
 
          if (next != nullptr)
@@ -707,11 +704,11 @@ static void examine_brace(chunk_t *bopen)
 
          if (get_chunk_parent_type(bopen) == CT_ELSE)
          {
-            chunk_t *tmp_next = chunk_get_next_ncnl(bopen);
+            chunk_t *tmp_next = chunk_get_next_ncnnl(bopen);
 
             if (chunk_is_token(tmp_next, CT_IF))
             {
-               chunk_t *tmp_prev = chunk_get_prev_ncnl(bopen);
+               chunk_t *tmp_prev = chunk_get_prev_ncnnl(bopen);
                LOG_FMT(LBRDEL, "%s(%d):  else-if removing braces on line %zu and %zu\n",
                        __func__, __LINE__, bopen->orig_line, pc->orig_line);
 
@@ -809,7 +806,7 @@ static void convert_brace(chunk_t *br)
       {
          // Issue #2219
          // look for opening brace
-         chunk_t *brace;
+         chunk_t *brace = nullptr;
 
          if (chunk_is_token(br, CT_VBRACE_OPEN))
          {
@@ -905,7 +902,7 @@ static void convert_vbrace_to_brace(void)
    log_rule_B("mod_full_brace_using");
    log_rule_B("mod_full_brace_function");
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (chunk_is_not_token(pc, CT_VBRACE_OPEN))
       {
@@ -935,7 +932,8 @@ static void convert_vbrace_to_brace(void)
 
          while ((tmp = chunk_get_next(tmp)) != nullptr)
          {
-            if (in_preproc && !tmp->flags.test(PCF_IN_PREPROC))
+            if (  in_preproc
+               && !tmp->flags.test(PCF_IN_PREPROC))
             {
                // Can't leave a preprocessor
                break;
@@ -1003,40 +1001,49 @@ chunk_t *insert_comment_after(chunk_t *ref, c_token_t cmt_type,
 static void append_tag_name(unc_text &txt, chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *cur = pc;
+   chunk_t *tmp = pc;
+
+   LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
+           __func__, __LINE__, txt.c_str());
 
    // step backwards over all a::b stuff
-   for (chunk_t *tmp = chunk_get_prev_ncnl(pc)
-        ; (chunk_is_token(tmp, CT_DC_MEMBER) || chunk_is_token(tmp, CT_MEMBER))
-        ; tmp = chunk_get_prev_ncnl(tmp))
+   while ((tmp = chunk_get_prev_ncnnl(tmp)) != nullptr)
    {
-      tmp = chunk_get_prev_ncnl(tmp);
-      cur = tmp;
+      if (  chunk_is_not_token(tmp, CT_DC_MEMBER)
+         && chunk_is_not_token(tmp, CT_MEMBER))
+      {
+         break;
+      }
+      tmp = chunk_get_prev_ncnnl(tmp);
+      pc  = tmp;
 
       if (!chunk_is_word(tmp))
       {
          break;
       }
    }
+   txt += pc->str;
+   LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
+           __func__, __LINE__, txt.c_str());
 
-   if (cur == nullptr)
+   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
    {
-      return;
-   }
-   txt += cur->str;
-   cur  = chunk_get_next_ncnl(cur);
-
-   for (chunk_t *tmp = cur, *tmp_next = chunk_get_next_ncnl(cur)
-        ; (chunk_is_token(tmp, CT_DC_MEMBER) || chunk_is_token(tmp, CT_MEMBER))
-        ; tmp = chunk_get_next_ncnl(tmp), tmp_next = chunk_get_next_ncnl(tmp))
-   {
-      txt += tmp->str;
-
-      if (tmp_next == nullptr)
+      if (  chunk_is_not_token(pc, CT_DC_MEMBER)
+         && chunk_is_not_token(pc, CT_MEMBER))
       {
          break;
       }
-      txt += tmp_next->str;
+      txt += pc->str;
+      LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
+              __func__, __LINE__, txt.c_str());
+      pc = chunk_get_next_ncnnl(pc);
+
+      if (pc != nullptr)
+      {
+         txt += pc->str;
+         LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
+                 __func__, __LINE__, txt.c_str());
+      }
    }
 } // append_tag_name
 
@@ -1049,7 +1056,7 @@ void add_long_closebrace_comment(void)
    chunk_t *ns_pc  = nullptr;
    chunk_t *cl_pc  = nullptr;
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (  chunk_is_token(pc, CT_FUNC_DEF)
          || chunk_is_token(pc, CT_OC_MSG_DECL))
@@ -1109,7 +1116,8 @@ void add_long_closebrace_comment(void)
 
          // make sure a newline follows in order to not overwrite an already
          // existring comment
-         if (tmp != nullptr && !chunk_is_newline(tmp))
+         if (  tmp != nullptr
+            && !chunk_is_newline(tmp))
          {
             break;
          }
@@ -1127,30 +1135,42 @@ void add_long_closebrace_comment(void)
             if (tag_pc != nullptr)
             {
                append_tag_name(xstr, tag_pc);
+               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                       __func__, __LINE__, xstr.c_str());
             }
          }
-         else if (get_chunk_parent_type(br_open) == CT_SWITCH && sw_pc != nullptr)
+         else if (  get_chunk_parent_type(br_open) == CT_SWITCH
+                 && sw_pc != nullptr)
          {
             log_rule_B("mod_add_long_switch_closebrace_comment");
             nl_min = options::mod_add_long_switch_closebrace_comment();
             tag_pc = sw_pc;
             xstr   = sw_pc->str;
+            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                    __func__, __LINE__, xstr.c_str());
          }
-         else if (get_chunk_parent_type(br_open) == CT_NAMESPACE && ns_pc != nullptr)
+         else if (  get_chunk_parent_type(br_open) == CT_NAMESPACE
+                 && ns_pc != nullptr)
          {
             log_rule_B("mod_add_long_namespace_closebrace_comment");
             nl_min = options::mod_add_long_namespace_closebrace_comment();
             tag_pc = ns_pc;
             xstr   = tag_pc->str;    // add 'namespace' to the string
+            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                    __func__, __LINE__, xstr.c_str());
 
             // next chunk, normally is going to be the namespace name
             // append it with a space to generate "namespace xyz"
-            chunk_t *tmp_next = chunk_get_next_ncnl(tag_pc);
+            chunk_t *tmp_next = chunk_get_next_ncnnl(tag_pc);
 
             if (chunk_is_not_token(tmp_next, CT_BRACE_OPEN)) // anonymous namespace -> ignore
             {
                xstr.append(" ");
+               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                       __func__, __LINE__, xstr.c_str());
                append_tag_name(xstr, tmp_next);
+               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                       __func__, __LINE__, xstr.c_str());
             }
          }
          else if (  get_chunk_parent_type(br_open) == CT_CLASS
@@ -1162,13 +1182,19 @@ void add_long_closebrace_comment(void)
             nl_min = options::mod_add_long_class_closebrace_comment();
             tag_pc = cl_pc;
             xstr   = tag_pc->str;
+            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                    __func__, __LINE__, xstr.c_str());
 
             chunk_t *tmp_next = chunk_get_next(cl_pc);
 
             if (tag_pc != nullptr)
             {
                xstr.append(" ");
+               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                       __func__, __LINE__, xstr.c_str());
                append_tag_name(xstr, tmp_next);
+               LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                       __func__, __LINE__, xstr.c_str());
             }
          }
 
@@ -1181,6 +1207,8 @@ void add_long_closebrace_comment(void)
                                     ? CT_COMMENT_CPP : CT_COMMENT;
 
             // Add a comment after the close brace
+            LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
+                    __func__, __LINE__, xstr.c_str());
             insert_comment_after(br_close, style, xstr);
          }
          break;
@@ -1194,7 +1222,7 @@ static void move_case_break(void)
    LOG_FUNC_ENTRY();
    chunk_t *prev = nullptr;
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (  chunk_is_token(pc, CT_BREAK)
          && chunk_is_token(prev, CT_BRACE_CLOSE)
@@ -1216,7 +1244,7 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
            __func__, __LINE__, br_open->orig_line);
 
    // Find the matching brace close
-   chunk_t *next     = chunk_get_next_ncnl(br_open, scope_e::PREPROC);
+   chunk_t *next     = chunk_get_next_ncnnl(br_open, scope_e::PREPROC);
    chunk_t *br_close = chunk_get_next_type(br_open, CT_BRACE_CLOSE, br_open->level, scope_e::PREPROC);
 
    if (br_close == nullptr)
@@ -1225,7 +1253,7 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
       return(next);
    }
    // Make sure 'break', 'return', 'goto', 'case' or '}' is after the close brace
-   chunk_t *pc = chunk_get_next_ncnl(br_close, scope_e::PREPROC);
+   chunk_t *pc = chunk_get_next_ncnnl(br_close, scope_e::PREPROC);
 
    if (  pc == nullptr
       || (  chunk_is_not_token(pc, CT_BREAK)
@@ -1242,9 +1270,10 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
    // scan to make sure there are no definitions at brace level between braces
    for (chunk_t *tmp_pc = br_open;
         tmp_pc != br_close;
-        tmp_pc = chunk_get_next_ncnl(tmp_pc, scope_e::PREPROC))
+        tmp_pc = chunk_get_next_ncnnl(tmp_pc, scope_e::PREPROC))
    {
-      if (tmp_pc->level == (br_open->level + 1) && tmp_pc->flags.test(PCF_VAR_DEF))
+      if (  tmp_pc->level == (br_open->level + 1)
+         && tmp_pc->flags.test(PCF_VAR_DEF))
       {
          LOG_FMT(LMCB, "%s(%d):  - vardef on line %zu: '%s'\n",
                  __func__, __LINE__, tmp_pc->orig_line, pc->text());
@@ -1257,7 +1286,7 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
 
    for (chunk_t *tmp_pc = br_open;
         tmp_pc != br_close;
-        tmp_pc = chunk_get_next_ncnl(tmp_pc, scope_e::PREPROC))
+        tmp_pc = chunk_get_next_ncnnl(tmp_pc, scope_e::PREPROC))
    {
       if (tmp_pc->brace_level == 0)
       {
@@ -1290,37 +1319,61 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
 static chunk_t *mod_case_brace_add(chunk_t *cl_colon)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LMCB, "%s(%d): line %zu",
-           __func__, __LINE__, cl_colon->orig_line);
+   LOG_FMT(LMCB, "%s(%d): orig_line %zu, orig_col is %zu\n",
+           __func__, __LINE__, cl_colon->orig_line, cl_colon->orig_col);
 
    chunk_t *pc   = cl_colon;
    chunk_t *last = nullptr;
-   chunk_t *next = chunk_get_next_ncnl(cl_colon, scope_e::PREPROC);
-
-   while ((pc = chunk_get_next_ncnl(pc, scope_e::PREPROC)) != nullptr)
+   // look for the case token to the colon
+   chunk_t *cas_ = chunk_get_prev_type(cl_colon, CT_CASE, cl_colon->level);
+   // look for the parent
+   chunk_t *swit = cas_->parent;
+   // look for the opening brace of the switch
+   chunk_t *open = chunk_get_next_type(swit, CT_BRACE_OPEN, swit->level);
+   // look for the closing brace of the switch
+   chunk_t *clos = chunk_skip_to_match(open);
+
+   // find the end of the case-block
+   while ((pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC)) != nullptr)
    {
-      if (pc->level < cl_colon->level)
+      LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu, pp_level is %zu\n",
+              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->pp_level);
+
+      if (pc->level == cl_colon->level)
       {
-         LOG_FMT(LMCB, "%s(%d):  - level drop\n", __func__, __LINE__);
-         return(next);
+         if (chunk_is_token(pc, CT_CASE))
+         {
+            LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
+                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
+            last = calculate_closing_brace_position(cl_colon, pc);
+            break;
+         }
       }
-
-      if (  pc->level == cl_colon->level
-         && (  chunk_is_token(pc, CT_CASE)
-            || chunk_is_token(pc, CT_BREAK)))
+      else if (pc->level == cl_colon->level - 1)
       {
-         last = pc;
-         break;
+         if (pc == clos)
+         {
+            LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
+                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
+            // end of switch is reached
+            last = calculate_closing_brace_position(cl_colon, pc);
+            LOG_FMT(LMCB, "%s(%d): last->text() is '%s', orig_line %zu, orig_col is %zu\n",
+                    __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+            break;
+         }
       }
    }
 
    if (last == nullptr)
    {
       LOG_FMT(LMCB, "%s(%d):  - last is nullptr\n", __func__, __LINE__);
+      chunk_t *next = chunk_get_next_ncnnl(cl_colon, scope_e::PREPROC);
       return(next);
    }
-   LOG_FMT(LMCB, "%s(%d):  - adding before '%s' on line %zu\n",
-           __func__, __LINE__, last->text(), last->orig_line);
+   LOG_FMT(LMCB, "%s(%d): last->text() is '%s', orig_line %zu, orig_col is %zu\n",
+           __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+   LOG_FMT(LMCB, "%s(%d): adding braces after '%s' on line %zu\n",
+           __func__, __LINE__, cl_colon->text(), cl_colon->orig_line);
 
    chunk_t chunk;
 
@@ -1329,20 +1382,17 @@ static chunk_t *mod_case_brace_add(chunk_t *cl_colon)
    chunk.orig_line   = cl_colon->orig_line;
    chunk.orig_col    = cl_colon->orig_col;
    chunk.level       = cl_colon->level;
+   chunk.pp_level    = cl_colon->pp_level;
    chunk.brace_level = cl_colon->brace_level;
    chunk.flags       = pc->flags & PCF_COPY_FLAGS;
    chunk.str         = "{";
-
    chunk_t *br_open = chunk_add_after(&chunk, cl_colon);
 
    set_chunk_type(&chunk, CT_BRACE_CLOSE);
    chunk.orig_line = last->orig_line;
    chunk.orig_col  = last->orig_col;
    chunk.str       = "}";
-
-   chunk_t *br_close = chunk_add_before(&chunk, last);
-
-   newline_add_before(last);
+   chunk_t *br_close = chunk_add_after(&chunk, last);
 
    for (pc = chunk_get_next(br_open, scope_e::PREPROC);
         pc != br_close;
@@ -1364,7 +1414,7 @@ static void mod_case_brace(void)
 
    while (pc != nullptr)
    {
-      chunk_t *next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
       if (next == nullptr)
       {
@@ -1389,7 +1439,7 @@ static void mod_case_brace(void)
       }
       else
       {
-         pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
       }
    }
 }
@@ -1447,7 +1497,7 @@ static void process_if_chain(chunk_t *br_start)
       }
       braces.push_back(br_close);
 
-      pc = chunk_get_next_ncnl(br_close, scope_e::PREPROC);
+      pc = chunk_get_next_ncnnl(br_close, scope_e::PREPROC);
 
       if (  pc == nullptr
          || chunk_is_not_token(pc, CT_ELSE))
@@ -1461,14 +1511,14 @@ static void process_if_chain(chunk_t *br_start)
          // There is an 'else' - we want full braces.
          must_have_braces = true;
       }
-      pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
       if (chunk_is_token(pc, CT_ELSEIF))
       {
          while (  chunk_is_not_token(pc, CT_VBRACE_OPEN)
                && chunk_is_not_token(pc, CT_BRACE_OPEN))
          {
-            pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+            pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
          }
       }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/braces.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.h
index 604cb1c1..d48f4014 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/braces.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/braces.h
@@ -1,10 +1,11 @@
 /**
  * @file braces.h
- * prototypes for braces.c
+ * prototypes for braces.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
  */
+
 #ifndef BRACES_H_INCLUDED
 #define BRACES_H_INCLUDED
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.cpp
new file mode 100644
index 00000000..a52ab017
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.cpp
@@ -0,0 +1,199 @@
+/**
+ * @file calculate_closing_brace_position.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "calculate_closing_brace_position.h"
+
+#include "chunk_list.h"
+
+using namespace uncrustify;
+
+
+chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
+{
+   LOG_FMT(LMCB, "%s(%d): cl_colon->text() is '%s', orig_line %zu, orig_col is %zu, level is %zu\n",
+           __func__, __LINE__, cl_colon->text(), cl_colon->orig_line, cl_colon->orig_col, cl_colon->level);
+   LOG_FMT(LMCB, "%s(%d): pc->text()       is '%s', orig_line %zu, orig_col is %zu, level is %zu\n",
+           __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level);
+   // end of block is reached
+   // look back over newline, preprocessor BUT NOT #endif
+
+   // Issue #3058
+
+   // examine going back the tokens: look for a "brace closing" or a "semi colon" until the colon
+   // look back over comment, newline, preprocessor BUT NOT #endif
+
+   size_t check_level = 0;
+
+   if (chunk_is_token(pc, CT_BRACE_CLOSE))
+   {
+      check_level = pc->level + 1;
+   }
+   else
+   {
+      check_level = pc->level;
+   }
+   size_t  erst_found      = 0;
+   chunk_t *is_brace_close = nullptr;
+   chunk_t *is_semicolon   = nullptr;
+   chunk_t *is_comment     = nullptr;
+   chunk_t *back           = chunk_get_prev_nnl(pc);
+
+   while (back != nullptr)
+   {
+      if (back == cl_colon)
+      {
+         break;
+      }
+
+      if (erst_found != 0)
+      {
+         break;
+      }
+
+      if (back->level == check_level)
+      {
+         if (  chunk_is_token(back, CT_BRACE_CLOSE)
+            || chunk_is_token(back, CT_VBRACE_CLOSE))
+         {
+            // brace_close found
+            is_brace_close = back;
+            LOG_FMT(LMCB, "%s(%d): BRACE_CLOSE: line is %zu, col is %zu, level is %zu\n",
+                    __func__, __LINE__, is_brace_close->orig_line, is_brace_close->orig_col, is_brace_close->level);
+            erst_found = 3;
+         }
+
+         if (chunk_is_token(back, CT_SEMICOLON))
+         {
+            // semicolon found
+            is_semicolon = back;
+            LOG_FMT(LMCB, "%s(%d): SEMICOLON:   line is %zu, col is %zu, level is %zu\n",
+                    __func__, __LINE__, is_semicolon->orig_line, is_semicolon->orig_col, is_semicolon->level);
+            erst_found = 4;
+         }
+
+         if (chunk_is_comment(back))
+         {
+            // comment found
+            is_comment = back;
+            LOG_FMT(LMCB, "%s(%d): COMMENT:     line is %zu, col is %zu, level is %zu\n",
+                    __func__, __LINE__, back->orig_line, back->orig_col, back->level);
+         }
+      }
+      back = chunk_get_prev(back);
+   }
+   LOG_FMT(LMCB, "%s(%d): erst_found is %zu\n",
+           __func__, __LINE__, erst_found);
+   chunk_t *last = nullptr;
+
+   if (  erst_found == 3
+      || erst_found == 4)
+   {
+      if (is_comment != nullptr)
+      {
+         chunk_t *second = nullptr;
+
+         if (erst_found == 3)
+         {
+            second = is_brace_close;
+         }
+         else
+         {
+            // erst_found == 4
+            second = is_semicolon;
+         }
+
+         if (second != nullptr)
+         {
+            if (is_comment->orig_line == second->orig_line)
+            {
+               last = is_comment;
+
+               if (cl_colon->orig_line == is_comment->orig_line)
+               {
+                  last = chunk_get_next(is_comment);
+               }
+            }
+            else
+            {
+               last = chunk_get_prev_ncnnl(pc);
+            }
+         }
+         else
+         {
+            LOG_FMT(LMCB, "\n\n%s(%d):\n", __func__, __LINE__);
+            fprintf(stderr, "FATAL: second is nullptr\n");
+            fprintf(stderr, "Please make a report.\n");
+            exit(EX_SOFTWARE);
+         }
+      }
+      else
+      {
+         last = chunk_get_prev_ncnnl(pc);
+      }
+   }
+   else
+   {
+      LOG_FMT(LMCB, "\n\n%s(%d):\n", __func__, __LINE__);
+      fprintf(stderr, "FATAL: erst_found is not 3 or 4\n");
+      fprintf(stderr, "Please make a report.\n");
+      exit(EX_SOFTWARE);
+   }
+
+   if (chunk_is_token(last, CT_COMMENT_CPP))         // Issue #3058
+   {
+      last = chunk_get_next(last);
+   }
+   LOG_FMT(LMCB, "%s(%d): last->text()     is '%s', orig_line %zu, orig_col is %zu\n",
+           __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+
+   if (chunk_is_preproc(last))
+   {
+      // we have a preprocessor token
+      while (last != nullptr)
+      {
+         LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
+                 __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+
+         if (chunk_is_token(last, CT_PP_ENDIF))
+         {
+            // look for the parent
+            chunk_t *parent_last = last->parent;
+            // compare the positions
+            int     comp = chunk_compare_position(parent_last, cl_colon);
+            LOG_FMT(LMCB, "%s(%d): comp is %d\n",
+                    __func__, __LINE__, comp);
+
+            if (comp == -1)
+            {
+               // cl_colon is after parent_last ==>
+               // the closing brace will be set before #endif
+               chunk_t *pp_start = chunk_get_pp_start(last);
+               last = chunk_get_prev_nnl(pp_start);
+               LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
+                       __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+            }
+            else if (comp == 1)
+            {
+               // cl_colon is before parent_last ==>
+               // the closing brace will be set after #endif
+               LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
+                       __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+            }
+            break;
+         }
+         last = chunk_get_prev_ncnnl(last);
+         LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
+                 __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+
+         if (!chunk_is_preproc(last))
+         {
+            break;
+         }
+      }
+   }
+   return(last);
+} // calculate_closing_brace_position
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.h
new file mode 100644
index 00000000..c82f4ace
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/calculate_closing_brace_position.h
@@ -0,0 +1,18 @@
+/**
+ * @file calculate_closing_brace_position.h
+ * prototype for calculate_closing_brace_position.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#ifndef CALCULATE_CLOSING_BRACE_POSITION_H_INCLUDED
+#define CALCULATE_CLOSING_BRACE_POSITION_H_INCLUDED
+
+#include "uncrustify_types.h"
+
+
+chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc);
+
+
+#endif /* CALCULATE_CLOSING_BRACE_POSITION_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/char_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/char_table.h
index 3fa23a54..3fa23a54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/char_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/char_table.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/chunk_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.cpp
index 9e0f1d23..fcaa7be9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/chunk_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.cpp
@@ -11,12 +11,6 @@
 #include "ListManager.h"
 #include "prototypes.h"
 #include "space.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
-
-#include <cstdlib>
-#include <cstring>
-
 
 typedef ListManager<chunk_t> ChunkList_t;
 
@@ -256,7 +250,8 @@ bool are_chunks_in_same_line(chunk_t *start, chunk_t *end)
       return(false);
    }
 
-   while (tmp != nullptr && tmp != end)
+   while (  tmp != nullptr
+         && tmp != end)
    {
       if (chunk_is_token(tmp, CT_NEWLINE))
       {
@@ -301,7 +296,7 @@ static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e sco
    {
       pc = search_function(pc, scope); // in either direction while
    } while (  pc != nullptr            // the end of the list was not reached yet
-           && (is_expected_type_and_level(pc, type, level) == false));
+           && (!is_expected_type_and_level(pc, type, level)));
 
    return(pc);                         // the latest chunk is the searched one
 }
@@ -319,7 +314,7 @@ static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scop
    {
       pc = search_function(pc, scope); // in either direction while
    } while (  pc != nullptr            // the end of the list was not reached yet
-           && (is_expected_string_and_level(pc, str, level, len) == false));
+           && (!is_expected_string_and_level(pc, str, level, len)));
 
    return(pc);                         // the latest chunk is the searched one
 }
@@ -346,7 +341,8 @@ static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_
 
 static chunk_t *chunk_ppa_search(chunk_t *cur, const check_t check_fct, const bool cond)
 {
-   if (cur && !cur->flags.test(PCF_IN_PREPROC))
+   if (  cur != nullptr
+      && !cur->flags.test(PCF_IN_PREPROC))
    {
       // if not in preprocessor, do a regular search
       return(chunk_search(cur, check_fct, scope_e::ALL,
@@ -354,7 +350,8 @@ static chunk_t *chunk_ppa_search(chunk_t *cur, const check_t check_fct, const bo
    }
    chunk_t *pc = cur;
 
-   while (pc != nullptr && (pc = pc->next) != nullptr)
+   while (  pc != nullptr
+         && (pc = pc->next) != nullptr)
    {
       if (!pc->flags.test(PCF_IN_PREPROC))
       {
@@ -394,7 +391,8 @@ chunk_t *chunk_get_next(chunk_t *cur, scope_e scope)
    }
    chunk_t *pc = g_cl.GetNext(cur);
 
-   if (pc == nullptr || scope == scope_e::ALL)
+   if (  pc == nullptr
+      || scope == scope_e::ALL)
    {
       return(pc);
    }
@@ -410,7 +408,8 @@ chunk_t *chunk_get_next(chunk_t *cur, scope_e scope)
    }
 
    // Not in a preproc, skip any preproc
-   while (pc != nullptr && pc->flags.test(PCF_IN_PREPROC))
+   while (  pc != nullptr
+         && pc->flags.test(PCF_IN_PREPROC))
    {
       pc = g_cl.GetNext(pc);
    }
@@ -426,7 +425,8 @@ chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope)
    }
    chunk_t *pc = g_cl.GetPrev(cur);
 
-   if (pc == nullptr || scope == scope_e::ALL)
+   if (  pc == nullptr
+      || scope == scope_e::ALL)
    {
       return(pc);
    }
@@ -442,7 +442,8 @@ chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope)
    }
 
    // Not in a preproc, skip any preproc
-   while (pc != nullptr && pc->flags.test(PCF_IN_PREPROC))
+   while (  pc != nullptr
+         && pc->flags.test(PCF_IN_PREPROC))
    {
       pc = g_cl.GetPrev(pc);
    }
@@ -477,15 +478,15 @@ static void chunk_log_msg(chunk_t *chunk, const log_sev_t log, const char *str)
 
    if (chunk_is_token(chunk, CT_NEWLINE))
    {
-      LOG_FMT(log, "<Newline>,");
+      LOG_FMT(log, "<Newline>,\n");
    }
    else if (chunk_is_token(chunk, CT_VBRACE_OPEN))
    {
-      LOG_FMT(log, "<VBRACE_OPEN>,");
+      LOG_FMT(log, "<VBRACE_OPEN>,\n");
    }
    else if (chunk_is_token(chunk, CT_VBRACE_CLOSE))
    {
-      LOG_FMT(log, "<VBRACE_CLOSE>,");
+      LOG_FMT(log, "<VBRACE_CLOSE>,\n");
    }
    else
    {
@@ -506,20 +507,21 @@ static void chunk_log(chunk_t *pc, const char *text)
 
       chunk_log_msg(pc, log, text);
 
-      if (prev != nullptr && next != nullptr)
+      if (  prev != nullptr
+         && next != nullptr)
       {
-         chunk_log_msg(prev, log, " @ between");
-         chunk_log_msg(next, log, " and");
+         chunk_log_msg(prev, log, "   @ between");
+         chunk_log_msg(next, log, "   and");
       }
       else if (next != nullptr)
       {
-         chunk_log_msg(next, log, " @ before");
+         chunk_log_msg(next, log, "   @ before");
       }
       else if (prev != nullptr)
       {
-         chunk_log_msg(prev, log, " @ after");
+         chunk_log_msg(prev, log, "   @ after");
       }
-      LOG_FMT(log, " stage is %s",
+      LOG_FMT(log, "   stage is %s",                             // Issue #3034
               get_unc_stage_name(cpd.unc_stage));
       log_func_stack_inline(log);
    }
@@ -538,10 +540,11 @@ chunk_t *chunk_add_before(const chunk_t *pc_in, chunk_t *ref)
 }
 
 
-void chunk_del_2(chunk_t *pc)
+void chunk_del(chunk_t * &pc)
 {
    g_cl.Pop(pc);
    delete pc;
+   pc = nullptr;
 }
 
 
@@ -582,25 +585,25 @@ chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope)
 }
 
 
-chunk_t *chunk_get_next_ncnl(chunk_t *cur, scope_e scope)
+chunk_t *chunk_get_next_ncnnl(chunk_t *cur, scope_e scope)
 {
    return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::FORWARD, false));
 }
 
 
-chunk_t *chunk_get_next_ncnlnp(chunk_t *cur, scope_e scope)
+chunk_t *chunk_get_next_ncnnlnp(chunk_t *cur, scope_e scope)
 {
    return(chunk_get_ncnlnp(cur, scope, direction_e::FORWARD));
 }
 
 
-chunk_t *chunk_ppa_get_next_ncnl(chunk_t *cur)
+chunk_t *chunk_ppa_get_next_ncnnl(chunk_t *cur)
 {
    return(chunk_ppa_search(cur, chunk_is_comment_or_newline, false));
 }
 
 
-chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope)
+chunk_t *chunk_get_prev_ncnnlnp(chunk_t *cur, scope_e scope)
 {
    return(chunk_get_ncnlnp(cur, scope, direction_e::BACKWARD));
 }
@@ -630,13 +633,13 @@ chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope)
 }
 
 
-chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope)
+chunk_t *chunk_get_prev_ncnnl(chunk_t *cur, scope_e scope)
 {
    return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::BACKWARD, false));
 }
 
 
-chunk_t *chunk_get_prev_ncnlni(chunk_t *cur, scope_e scope)
+chunk_t *chunk_get_prev_ncnnlni(chunk_t *cur, scope_e scope)
 {
    return(chunk_search(cur, chunk_is_comment_or_newline_or_ignored, scope, direction_e::BACKWARD, false));
 }
@@ -697,7 +700,8 @@ chunk_t *chunk_first_on_line(chunk_t *pc)
 {
    chunk_t *first = pc;
 
-   while ((pc = chunk_get_prev(pc)) != nullptr && !chunk_is_newline(pc))
+   while (  (pc = chunk_get_prev(pc)) != nullptr
+         && !chunk_is_newline(pc))
    {
       first = pc;
    }
@@ -746,7 +750,8 @@ void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2)
    chunk_t *ref2 = chunk_get_prev(pc2);
 
    // Move the line started at pc2 before pc1
-   while (pc2 != nullptr && !chunk_is_newline(pc2))
+   while (  pc2 != nullptr
+         && !chunk_is_newline(pc2))
    {
       chunk_t *tmp = chunk_get_next(pc2);
       g_cl.Pop(pc2);
@@ -760,7 +765,8 @@ void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2)
     */
 
    // Now move the line started at pc1 after ref2
-   while (pc1 != nullptr && !chunk_is_newline(pc1))
+   while (  pc1 != nullptr
+         && !chunk_is_newline(pc1))
    {
       chunk_t *tmp = chunk_get_next(pc1);
       g_cl.Pop(pc1);
@@ -786,7 +792,8 @@ void chunk_swap_lines(chunk_t *pc1, chunk_t *pc2)
     * pc1 and pc2 should be the newlines for their lines.
     * swap the chunks and the nl_count so that the spacing remains the same.
     */
-   if (pc1 != nullptr && pc2 != nullptr)
+   if (  pc1 != nullptr
+      && pc2 != nullptr)
    {
       size_t nl_count = pc1->nl_count;
 
@@ -820,15 +827,15 @@ void chunk_flags_set_real(chunk_t *pc, pcf_flags_t clr_bits, pcf_flags_t set_bit
       if (pc->flags != nflags)
       {
          LOG_FMT(LSETFLG,
-                 "%s(%d): %016llx^%016llx=%016llx "
-                 "orig_line is %zu, orig_col is %zu, text() '%s', type is %s, ",
+                 "%s(%d): %016llx^%016llx=%016llx\n"
+                 "   orig_line is %zu, orig_col is %zu, text() '%s', type is %s,",
                  __func__, __LINE__,
                  static_cast<pcf_flags_t::int_t>(pc->flags),
                  static_cast<pcf_flags_t::int_t>(pc->flags ^ nflags),
                  static_cast<pcf_flags_t::int_t>(nflags),
                  pc->orig_line, pc->orig_col, pc->text(),
                  get_token_name(pc->type));
-         LOG_FMT(LSETFLG, "parent_type is %s",
+         LOG_FMT(LSETFLG, " parent_type is %s,\n  ",
                  get_token_name(get_chunk_parent_type(pc)));
          log_func_stack_inline(LSETFLG);
          pc->flags = nflags;
@@ -882,7 +889,8 @@ void set_chunk_parent_real(chunk_t *pc, c_token_t token, const char *func, int l
    }
    else
    {
-      LOG_FMT(LSETPAR, "'%s'\n", pc->text());
+      char copy[1000];
+      LOG_FMT(LSETPAR, "'%s'\n", pc->elided_text(copy));
    }
    LOG_FMT(LSETPAR, "   pc->type is %s, pc->parent_type is %s => *type is %s, *parent_type is %s\n",
            get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
@@ -907,7 +915,7 @@ static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope, const direct
 {
    chunk_t *pc = cur;
 
-   pc = (chunk_is_preproc(pc) == true) ?
+   pc = chunk_is_preproc(pc) ?
         chunk_search(pc, chunk_is_comment_or_newline_in_preproc, scope, dir, false) :
         chunk_search(pc, chunk_is_comment_newline_or_preproc, scope, dir, false);
    return(pc);
@@ -917,6 +925,15 @@ static chunk_t *chunk_get_ncnlnp(chunk_t *cur, const scope_e scope, const direct
 static chunk_t *chunk_add(const chunk_t *pc_in, chunk_t *ref, const direction_e pos)
 {
 #ifdef DEBUG
+   // test if the pc_in chunk is properly set
+   if (pc_in->pp_level == 999)
+   {
+      fprintf(stderr, "%s(%d): pp_level is not set\n", __func__, __LINE__);
+      log_func_stack_inline(LSETFLG);
+      log_flush(true);
+      exit(EX_SOFTWARE);
+   }
+
    if (pc_in->orig_line == 0)
    {
       fprintf(stderr, "%s(%d): no line number\n", __func__, __LINE__);
@@ -949,18 +966,19 @@ static chunk_t *chunk_add(const chunk_t *pc_in, chunk_t *ref, const direction_e
       chunk_log(pc, "chunk_add(A):");
    }
    return(pc);
-}
+} // chunk_add
 
 
 chunk_t *chunk_get_next_ssq(chunk_t *cur)
 {
-   while (chunk_is_token(cur, CT_TSQUARE) || chunk_is_token(cur, CT_SQUARE_OPEN))
+   while (  chunk_is_token(cur, CT_TSQUARE)
+         || chunk_is_token(cur, CT_SQUARE_OPEN))
    {
       if (chunk_is_token(cur, CT_SQUARE_OPEN))
       {
          cur = chunk_skip_to_match(cur);
       }
-      cur = chunk_get_next_ncnl(cur);
+      cur = chunk_get_next_ncnnl(cur);
    }
    return(cur);
 }
@@ -968,13 +986,14 @@ chunk_t *chunk_get_next_ssq(chunk_t *cur)
 
 chunk_t *chunk_get_prev_ssq(chunk_t *cur)
 {
-   while (chunk_is_token(cur, CT_TSQUARE) || chunk_is_token(cur, CT_SQUARE_CLOSE))
+   while (  chunk_is_token(cur, CT_TSQUARE)
+         || chunk_is_token(cur, CT_SQUARE_CLOSE))
    {
       if (chunk_is_token(cur, CT_SQUARE_CLOSE))
       {
          cur = chunk_skip_to_match_rev(cur);
       }
-      cur = chunk_get_prev_ncnl(cur);
+      cur = chunk_get_prev_ncnnl(cur);
    }
    return(cur);
 }
@@ -1005,7 +1024,7 @@ static chunk_t *chunk_skip_dc_member(chunk_t *start, scope_e scope, direction_e
       return(nullptr);
    }
    const auto step_fcn = (dir == direction_e::FORWARD)
-                         ? chunk_get_next_ncnl : chunk_get_prev_ncnl;
+                         ? chunk_get_next_ncnnl : chunk_get_prev_ncnnl;
 
    chunk_t *pc   = start;
    chunk_t *next = chunk_is_token(pc, CT_DC_MEMBER) ? pc : step_fcn(pc, scope);
@@ -1070,3 +1089,71 @@ c_token_t get_type_of_the_parent(chunk_t *pc)
    }
    return(pc->parent->type);
 }
+
+
+bool chunk_is_attribute_or_declspec(chunk_t *pc)
+{
+   return(  language_is_set(LANG_CPP)
+         && (  chunk_is_token(pc, CT_ATTRIBUTE)
+            || chunk_is_token(pc, CT_DECLSPEC)));
+}
+
+
+bool chunk_is_class_enum_struct_union(chunk_t *pc)
+{
+   return(  chunk_is_class_or_struct(pc)
+         || chunk_is_enum(pc)
+         || chunk_is_token(pc, CT_UNION));
+}
+
+
+bool chunk_is_class_or_struct(chunk_t *pc)
+{
+   return(  chunk_is_token(pc, CT_CLASS)
+         || chunk_is_token(pc, CT_STRUCT));
+}
+
+
+bool chunk_is_class_struct_union(chunk_t *pc)
+{
+   return(  chunk_is_class_or_struct(pc)
+         || chunk_is_token(pc, CT_UNION));
+}
+
+
+bool chunk_is_enum(chunk_t *pc)
+{
+   return(  chunk_is_token(pc, CT_ENUM)
+         || chunk_is_token(pc, CT_ENUM_CLASS));
+}
+
+
+int chunk_compare_position(const chunk_t *A_token, const chunk_t *B_token)
+{
+   if (A_token == nullptr)
+   {
+      assert(A_token);
+   }
+
+   if (B_token == nullptr)
+   {
+      assert(B_token);
+   }
+
+   if (A_token->orig_line < B_token->orig_line)
+   {
+      return(-1);
+   }
+   else if (A_token->orig_line == B_token->orig_line)
+   {
+      if (A_token->orig_col < B_token->orig_col)
+      {
+         return(-1);
+      }
+      else if (A_token->orig_col == B_token->orig_col)
+      {
+         return(0);
+      }
+   }
+   return(1);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/chunk_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.h
index 10863d67..7a79474d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/chunk_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/chunk_list.h
@@ -87,12 +87,7 @@ chunk_t *chunk_add_before(const chunk_t *pc_in, chunk_t *ref);
  *
  * @param pc  chunk to delete
  */
-#define chunk_del(pc)    do { \
-      chunk_del_2((pc));      \
-      (pc) = nullptr;         \
-} while (false)
-
-void chunk_del_2(chunk_t *pc);
+void chunk_del(chunk_t * &pc);
 
 
 /**
@@ -206,7 +201,7 @@ chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope = scope_e::ALL);
  * @param cur    chunk to use as start point
  * @param scope  code region to search in
  */
-chunk_t *chunk_get_next_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL);
+chunk_t *chunk_get_next_ncnnl(chunk_t *cur, scope_e scope = scope_e::ALL);
 
 
 /**
@@ -215,19 +210,19 @@ chunk_t *chunk_get_next_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL);
  * @param cur    chunk to use as start point
  * @param scope  code region to search in
  */
-chunk_t *chunk_get_next_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
+chunk_t *chunk_get_next_ncnnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
 
 
 /**
  * Gets the next non-NEWLINE and non-comment chunk (preprocessor aware).
- * Unlike chunk_get_next_ncnl, this will also ignore a line continuation if
+ * Unlike chunk_get_next_ncnnl, this will also ignore a line continuation if
  * the starting chunk is in a preprocessor directive, and may return a newline
  * if the search reaches the end of a preprocessor directive.
  *
  * @param cur    chunk to use as start point
  * @param scope  code region to search in
  */
-chunk_t *chunk_ppa_get_next_ncnl(chunk_t *cur);
+chunk_t *chunk_ppa_get_next_ncnnl(chunk_t *cur);
 
 
 /**
@@ -294,7 +289,7 @@ chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope = scope_e::ALL);
  * @param cur    chunk to use as start point
  * @param scope  code region to search in
  */
-chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL);
+chunk_t *chunk_get_prev_ncnnl(chunk_t *cur, scope_e scope = scope_e::ALL);
 
 
 /**
@@ -303,7 +298,7 @@ chunk_t *chunk_get_prev_ncnl(chunk_t *cur, scope_e scope = scope_e::ALL);
  * @param cur    chunk to use as start point
  * @param scope  code region to search in
  */
-chunk_t *chunk_get_prev_ncnlni(chunk_t *cur, scope_e scope = scope_e::ALL);
+chunk_t *chunk_get_prev_ncnnlni(chunk_t *cur, scope_e scope = scope_e::ALL);
 
 
 /**
@@ -312,7 +307,7 @@ chunk_t *chunk_get_prev_ncnlni(chunk_t *cur, scope_e scope = scope_e::ALL);
  * @param cur    chunk to use as start point
  * @param scope  code region to search in
  */
-chunk_t *chunk_get_prev_ncnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
+chunk_t *chunk_get_prev_ncnnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
 
 
 /**
@@ -477,7 +472,8 @@ static inline bool is_expected_type_and_level(chunk_t *pc, c_token_t type, int l
 {
    // we don't care about the level (if it is negative) or it is as expected
    // and the type is as expected
-   return(  (level < 0 || pc->level == static_cast<size_t>(level))
+   return(  (  level < 0
+            || pc->level == static_cast<size_t>(level))
          && pc->type == type);
 }
 
@@ -485,7 +481,8 @@ static inline bool is_expected_type_and_level(chunk_t *pc, c_token_t type, int l
 static inline bool is_expected_string_and_level(chunk_t *pc, const char *str, int level, size_t len)
 {
    // we don't care about the level (if it is negative) or it is as expected
-   return(  (level < 0 || pc->level == static_cast<size_t>(level))
+   return(  (  level < 0
+            || pc->level == static_cast<size_t>(level))
          && pc->len() == len                       // and the length is as expected
          && memcmp(str, pc->text(), len) == 0);    // and the strings are equal
 }
@@ -493,13 +490,15 @@ static inline bool is_expected_string_and_level(chunk_t *pc, const char *str, in
 
 static inline bool chunk_is_token(const chunk_t *pc, c_token_t c_token)
 {
-   return(pc != nullptr && pc->type == c_token);
+   return(  pc != nullptr
+         && pc->type == c_token);
 }
 
 
 static inline bool chunk_is_not_token(const chunk_t *pc, c_token_t c_token)
 {
-   return(pc != nullptr && pc->type != c_token);
+   return(  pc != nullptr
+         && pc->type != c_token);
 }
 
 
@@ -567,21 +566,59 @@ static inline bool chunk_is_comment(chunk_t *pc)
 }
 
 
+/**
+ * Returns true if the chunk under test is an inheritance access specifier
+ */
+static inline bool chunk_is_cpp_inheritance_access_specifier(chunk_t *pc)
+{
+   return(  language_is_set(LANG_CPP)
+         && (  chunk_is_token(pc, CT_ACCESS)
+            || chunk_is_token(pc, CT_QUALIFIER))
+         && (  std::strncmp(pc->str.c_str(), "private", 7) == 0
+            || std::strncmp(pc->str.c_str(), "protected", 9) == 0
+            || std::strncmp(pc->str.c_str(), "public", 6) == 0));
+} // chunk_is_cpp_inheritance_access_specifier
+
+
+static inline bool chunk_is_colon(chunk_t *pc)
+{
+   return(  chunk_is_token(pc, CT_ACCESS_COLON)
+         || chunk_is_token(pc, CT_ASM_COLON)
+         || chunk_is_token(pc, CT_BIT_COLON)
+         || chunk_is_token(pc, CT_CASE_COLON)
+         || chunk_is_token(pc, CT_CLASS_COLON)
+         || chunk_is_token(pc, CT_COLON)
+         || chunk_is_token(pc, CT_COND_COLON)
+         || chunk_is_token(pc, CT_CONSTR_COLON)
+         || chunk_is_token(pc, CT_CS_SQ_COLON)
+         || chunk_is_token(pc, CT_D_ARRAY_COLON)
+         || chunk_is_token(pc, CT_FOR_COLON)
+         || chunk_is_token(pc, CT_LABEL_COLON)
+         || chunk_is_token(pc, CT_OC_COLON)
+         || chunk_is_token(pc, CT_OC_DICT_COLON)
+         || chunk_is_token(pc, CT_TAG_COLON)
+         || chunk_is_token(pc, CT_WHERE_COLON));
+}
+
+
 static inline bool chunk_is_single_line_comment(chunk_t *pc)
 {
-   return(chunk_is_token(pc, CT_COMMENT) || chunk_is_token(pc, CT_COMMENT_CPP));
+   return(  chunk_is_token(pc, CT_COMMENT)
+         || chunk_is_token(pc, CT_COMMENT_CPP));
 }
 
 
 static inline bool chunk_is_newline(chunk_t *pc)
 {
-   return(chunk_is_token(pc, CT_NEWLINE) || chunk_is_token(pc, CT_NL_CONT));
+   return(  chunk_is_token(pc, CT_NEWLINE)
+         || chunk_is_token(pc, CT_NL_CONT));
 }
 
 
 static inline bool chunk_is_semicolon(chunk_t *pc)
 {
-   return(chunk_is_token(pc, CT_SEMICOLON) || chunk_is_token(pc, CT_VSEMICOLON));
+   return(  chunk_is_token(pc, CT_SEMICOLON)
+         || chunk_is_token(pc, CT_VSEMICOLON));
 }
 
 
@@ -594,21 +631,25 @@ static inline bool chunk_is_semicolon(chunk_t *pc)
  */
 static inline bool chunk_is_blank(chunk_t *pc)
 {
-   return(pc != nullptr && (pc->len() == 0));
+   return(  pc != nullptr
+         && (pc->len() == 0));
 }
 
 
 //! checks if a chunk is valid and either a comment or newline
 static inline bool chunk_is_comment_or_newline(chunk_t *pc)
 {
-   return(chunk_is_comment(pc) || chunk_is_newline(pc));
+   return(  chunk_is_comment(pc)
+         || chunk_is_newline(pc));
 }
 
 
 //! checks if a chunk is valid and either a comment or newline or ignored
 static inline bool chunk_is_comment_or_newline_or_ignored(chunk_t *pc)
 {
-   return(chunk_is_comment(pc) || chunk_is_newline(pc) || chunk_is_token(pc, CT_IGNORED));
+   return(  chunk_is_comment(pc)
+         || chunk_is_newline(pc)
+         || chunk_is_token(pc, CT_IGNORED));
 }
 
 
@@ -622,7 +663,8 @@ static inline bool chunk_is_balanced_square(chunk_t *pc)
 
 static inline bool chunk_is_preproc(chunk_t *pc)
 {
-   return(pc != nullptr && pc->flags.test(PCF_IN_PREPROC));
+   return(  pc != nullptr
+         && pc->flags.test(PCF_IN_PREPROC));
 }
 
 
@@ -630,7 +672,8 @@ static inline bool chunk_is_comment_or_newline_in_preproc(chunk_t *pc)
 {
    return(  pc != nullptr
          && chunk_is_preproc(pc)
-         && (chunk_is_comment(pc) || chunk_is_newline(pc)));
+         && (  chunk_is_comment(pc)
+            || chunk_is_newline(pc)));
 }
 
 
@@ -644,7 +687,8 @@ static inline bool chunk_is_comment_newline_or_preproc(chunk_t *pc)
 
 static inline bool chunk_is_comment_newline_or_blank(chunk_t *pc)
 {
-   return(chunk_is_comment_or_newline(pc) || chunk_is_blank(pc));
+   return(  chunk_is_comment_or_newline(pc)
+         || chunk_is_blank(pc));
 }
 
 
@@ -721,7 +765,10 @@ static inline bool chunk_is_star(chunk_t *pc)
 
 static inline bool chunk_is_nullable(chunk_t *pc)
 {
-   return(language_is_set(LANG_CS) && (pc != nullptr) && (pc->len() == 1) && (pc->str[0] == '?'));
+   return(  language_is_set(LANG_CS)
+         && (pc != nullptr)
+         && (pc->len() == 1)
+         && (pc->str[0] == '?'));
 }
 
 
@@ -735,7 +782,8 @@ static inline bool chunk_is_addr(chunk_t *pc)
       chunk_t *prev = chunk_get_prev(pc);
 
       if (  pc->flags.test(PCF_IN_TEMPLATE)
-         && (chunk_is_token(prev, CT_COMMA) || chunk_is_token(prev, CT_ANGLE_OPEN)))
+         && (  chunk_is_token(prev, CT_COMMA)
+            || chunk_is_token(prev, CT_ANGLE_OPEN)))
       {
          return(false);
       }
@@ -764,25 +812,35 @@ static inline bool chunk_is_ptr_operator(chunk_t *pc)
 }
 
 
+static inline bool chunk_is_pointer_or_reference(chunk_t *pc)
+{
+   return(  chunk_is_ptr_operator(pc)
+         || chunk_is_token(pc, CT_BYREF));
+}
+
+
 //! Check to see if there is a newline between the two chunks
 bool chunk_is_newline_between(chunk_t *start, chunk_t *end);
 
 
 static inline bool chunk_is_closing_brace(chunk_t *pc)
 {
-   return(chunk_is_token(pc, CT_BRACE_CLOSE) || chunk_is_token(pc, CT_VBRACE_CLOSE));
+   return(  chunk_is_token(pc, CT_BRACE_CLOSE)
+         || chunk_is_token(pc, CT_VBRACE_CLOSE));
 }
 
 
 static inline bool chunk_is_opening_brace(chunk_t *pc)
 {
-   return(chunk_is_token(pc, CT_BRACE_OPEN) || chunk_is_token(pc, CT_VBRACE_OPEN));
+   return(  chunk_is_token(pc, CT_BRACE_OPEN)
+         || chunk_is_token(pc, CT_VBRACE_OPEN));
 }
 
 
 static inline bool chunk_is_vbrace(chunk_t *pc)
 {
-   return(chunk_is_token(pc, CT_VBRACE_CLOSE) || chunk_is_token(pc, CT_VBRACE_OPEN));
+   return(  chunk_is_token(pc, CT_VBRACE_CLOSE)
+         || chunk_is_token(pc, CT_VBRACE_OPEN));
 }
 
 
@@ -791,7 +849,8 @@ static inline bool chunk_is_paren_open(chunk_t *pc)
    return(  chunk_is_token(pc, CT_PAREN_OPEN)
          || chunk_is_token(pc, CT_SPAREN_OPEN)
          || chunk_is_token(pc, CT_TPAREN_OPEN)
-         || chunk_is_token(pc, CT_FPAREN_OPEN));
+         || chunk_is_token(pc, CT_FPAREN_OPEN)
+         || chunk_is_token(pc, CT_LPAREN_OPEN));
 }
 
 
@@ -844,7 +903,7 @@ static inline bool chunk_is_forin(chunk_t *pc)
    if (  language_is_set(LANG_OC)
       && chunk_is_token(pc, CT_SPAREN_OPEN))
    {
-      chunk_t *prev = chunk_get_prev_ncnl(pc);
+      chunk_t *prev = chunk_get_prev_ncnnl(pc);
 
       if (chunk_is_token(prev, CT_FOR))
       {
@@ -854,7 +913,7 @@ static inline bool chunk_is_forin(chunk_t *pc)
                && next->type != CT_SPAREN_CLOSE
                && next->type != CT_IN)
          {
-            next = chunk_get_next_ncnl(next);
+            next = chunk_get_next_ncnnl(next);
          }
 
          if (chunk_is_token(next, CT_IN))
@@ -867,18 +926,48 @@ static inline bool chunk_is_forin(chunk_t *pc)
 }
 
 
+/**
+ * Returns true if pc is an CT_ATTRIBUTE or CT_DECLSPEC
+ */
+bool chunk_is_attribute_or_declspec(chunk_t *pc);
+
+
+/**
+ * Returns true if pc is one of CT_CLASS, CT_ENUM, CT_ENUM_CLASS, CT_STRUCT or CT_UNION
+ */
+bool chunk_is_class_enum_struct_union(chunk_t *pc);
+
+
+/**
+ * Returns true if pc is a CT_CLASS or CT_STRUCT
+ */
+bool chunk_is_class_or_struct(chunk_t *pc);
+
+
+/**
+ * Returns true if pc is one of CT_CLASS, CT_STRUCT or CT_UNION
+ */
+bool chunk_is_class_struct_union(chunk_t *pc);
+
+
+/**
+ * Returns true if pc is a CT_ENUM or CT_ENUM_CLASS
+ */
+bool chunk_is_enum(chunk_t *pc);
+
+
 void set_chunk_type_real(chunk_t *pc, c_token_t tt, const char *func, int line);
 
 
 void set_chunk_parent_real(chunk_t *pc, c_token_t tt, const char *func, int line);
 
 
-#define set_chunk_type(pc, tt)      do {                   \
-      set_chunk_type_real((pc), (tt), __func__, __LINE__); \
+#define set_chunk_type(pc, tt)      do {                               \
+      set_chunk_type_real((pc), (tt), __unqualified_func__, __LINE__); \
 } while (false)
 
-#define set_chunk_parent(pc, tt)    do {                     \
-      set_chunk_parent_real((pc), (tt), __func__, __LINE__); \
+#define set_chunk_parent(pc, tt)    do {                                 \
+      set_chunk_parent_real((pc), (tt), __unqualified_func__, __LINE__); \
 } while (false)
 
 
@@ -907,4 +996,19 @@ void chunk_set_parent(chunk_t *pc, chunk_t *parent);
 c_token_t get_type_of_the_parent(chunk_t *pc);
 
 
+/**
+ * @brief compare the positions of two tokens in a file.
+ *
+ * The function compares the two positions of two tokens.
+ *
+ * @param A_token
+ * @param B_token
+ *
+ * @return returns an integer less than, equal to, or greater than zero
+ *         if A_token is found, respectively, to be less/before than, to
+ *         match, or be greater/after than B_token.
+ */
+int chunk_compare_position(const chunk_t *A_token, const chunk_t *B_token);
+
+
 #endif /* CHUNK_LIST_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.cpp
index 56fe1960..920a27db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.cpp
@@ -9,30 +9,20 @@
 
 #include "combine.h"
 
-#include "chunk_list.h"
 #include "combine_fix_mark.h"
-#include "combine_labels.h"
 #include "combine_skip.h"
 #include "combine_tools.h"
-#include "ChunkStack.h"
-#include "error_types.h"
+#include "EnumStructUnionParser.h"
 #include "flag_braced_init_list.h"
 #include "flag_parens.h"
 #include "lang_pawn.h"
-#include "language_tools.h"
-#include "log_rules.h"
 #include "newlines.h"
 #include "prototypes.h"
 #include "tokenize_cleanup.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
 #include <limits>
-#include <map>
+
+constexpr static auto LCURRENT = LCOMBINE;
 
 using namespace std;
 using namespace uncrustify;
@@ -264,13 +254,13 @@ static void flag_asm(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *tmp = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+   chunk_t *tmp = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
    if (chunk_is_not_token(tmp, CT_QUALIFIER))
    {
       return;
    }
-   chunk_t *po = chunk_get_next_ncnl(tmp, scope_e::PREPROC);
+   chunk_t *po = chunk_get_next_ncnnl(tmp, scope_e::PREPROC);
 
    if (!chunk_is_paren_open(po))
    {
@@ -285,10 +275,10 @@ static void flag_asm(chunk_t *pc)
    set_chunk_parent(po, CT_ASM);
    set_chunk_parent(end, CT_ASM);
 
-   for (  tmp = chunk_get_next_ncnl(po, scope_e::PREPROC);
+   for (  tmp = chunk_get_next_ncnnl(po, scope_e::PREPROC);
           tmp != nullptr
        && tmp != end;
-          tmp = chunk_get_next_ncnl(tmp, scope_e::PREPROC))
+          tmp = chunk_get_next_ncnnl(tmp, scope_e::PREPROC))
    {
       if (chunk_is_token(tmp, CT_COLON))
       {
@@ -297,8 +287,8 @@ static void flag_asm(chunk_t *pc)
       else if (chunk_is_token(tmp, CT_DC_MEMBER))
       {
          // if there is a string on both sides, then this is two ASM_COLONs
-         if (  chunk_is_token(chunk_get_next_ncnl(tmp, scope_e::PREPROC), CT_STRING)
-            && chunk_is_token(chunk_get_prev_ncnlni(tmp, scope_e::PREPROC), CT_STRING)) // Issue #2279
+         if (  chunk_is_token(chunk_get_next_ncnnl(tmp, scope_e::PREPROC), CT_STRING)
+            && chunk_is_token(chunk_get_prev_ncnnlni(tmp, scope_e::PREPROC), CT_STRING)) // Issue #2279
          {
             chunk_t nc;
 
@@ -317,7 +307,7 @@ static void flag_asm(chunk_t *pc)
       }
    }
 
-   tmp = chunk_get_next_ncnl(end, scope_e::PREPROC);
+   tmp = chunk_get_next_ncnnl(end, scope_e::PREPROC);
 
    if (tmp == nullptr)
    {
@@ -334,7 +324,6 @@ static void flag_asm(chunk_t *pc)
 void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *tmp;
 
    // separate the uses of CT_ASSIGN sign '='
    // into CT_ASSIGN_DEFAULT_ARG, CT_ASSIGN_FUNC_PROTO
@@ -391,7 +380,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          || chunk_is_token(pc, CT_ALIGN)))
    {
       // mark the parenthesis parent
-      tmp = set_paren_parent(next, pc->type);
+      chunk_t *tmp = set_paren_parent(next, pc->type);
 
       // For a D cast - convert the next item
       if (  chunk_is_token(pc, CT_D_CAST)
@@ -431,7 +420,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             }
          }
 
-         for (tmp = chunk_get_prev_ncnlni(pc); tmp != nullptr; tmp = chunk_get_prev_ncnlni(tmp)) // Issue #2279
+         for (tmp = chunk_get_prev_ncnnlni(pc); tmp != nullptr; tmp = chunk_get_prev_ncnnlni(tmp)) // Issue #2279
          {
             if (  chunk_is_semicolon(tmp)
                || chunk_is_token(tmp, CT_BRACE_OPEN)
@@ -462,7 +451,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       if (chunk_is_token(next, CT_PAREN_OPEN))
       {
          set_chunk_parent(next, pc->type);
-         tmp = chunk_get_next(next);
+         chunk_t *tmp = chunk_get_next(next);
 
          while (tmp != nullptr)
          {
@@ -590,13 +579,13 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
    if (chunk_is_token(pc, CT_NEW))
    {
-      chunk_t *ts = nullptr;
-      tmp = next;
+      chunk_t *ts  = nullptr;
+      chunk_t *tmp = next;
 
       if (chunk_is_token(tmp, CT_TSQUARE))
       {
          ts  = tmp;
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
 
       if (  chunk_is_token(tmp, CT_BRACE_OPEN)
@@ -629,7 +618,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          set_paren_parent(next, CT_ASSIGN);
 
          // Mark one-liner assignment
-         tmp = next;
+         chunk_t *tmp = next;
 
          while ((tmp = chunk_get_next_nc(tmp)) != nullptr)
          {
@@ -656,7 +645,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
    if (chunk_is_token(pc, CT_ANNOTATION))
    {
-      tmp = chunk_get_next_ncnl(pc);
+      chunk_t *tmp = chunk_get_next_ncnnl(pc);
 
       if (chunk_is_paren_open(tmp))
       {
@@ -667,7 +656,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
    if (  chunk_is_token(pc, CT_SIZEOF)
       && language_is_set(LANG_ALLC))
    {
-      tmp = chunk_get_next_ncnl(pc);
+      chunk_t *tmp = chunk_get_next_ncnnl(pc);
 
       if (chunk_is_token(tmp, CT_ELLIPSIS))
       {
@@ -678,14 +667,14 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
    if (  chunk_is_token(pc, CT_DECLTYPE)
       && pc->parent_type != CT_FUNC_DEF)
    {
-      tmp = chunk_get_next_ncnl(pc);
+      chunk_t *tmp = chunk_get_next_ncnnl(pc);
 
       if (chunk_is_paren_open(tmp))
       {
          // decltype may be followed by a braced-init-list
          tmp = set_paren_parent(tmp, CT_DECLTYPE);
 
-         if (chunk_is_opening_brace(tmp))
+         if (chunk_is_opening_brace(tmp) && !pc->flags.test(PCF_IN_LAMBDA))
          {
             tmp = set_paren_parent(tmp, CT_BRACED_INIT_LIST);
 
@@ -737,23 +726,18 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       fix_typedef(pc);
    }
 
-   if (  chunk_is_token(pc, CT_ENUM)
-      || chunk_is_token(pc, CT_STRUCT)
-      || chunk_is_token(pc, CT_UNION)
-      || (  chunk_is_token(pc, CT_CLASS)
-         && !language_is_set(LANG_D)))
+   if (  chunk_is_class_enum_struct_union(pc)
+      && chunk_is_not_token(prev, CT_TYPEDEF))
    {
-      if (chunk_is_not_token(prev, CT_TYPEDEF))
-      {
-         fix_enum_struct_union(pc);
-      }
+      EnumStructUnionParser parser;
+      parser.parse(pc);
    }
 
    if (chunk_is_token(pc, CT_EXTERN))
    {
       if (chunk_is_paren_open(next))
       {
-         tmp = flag_parens(next, PCF_NONE, CT_NONE, CT_EXTERN, true);
+         chunk_t *tmp = flag_parens(next, PCF_NONE, CT_NONE, CT_EXTERN, true);
 
          if (chunk_is_token(tmp, CT_BRACE_OPEN))
          {
@@ -764,7 +748,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          // next likely is a string (see tokenize_cleanup.cpp)
          set_chunk_parent(next, CT_EXTERN);
-         tmp = chunk_get_next_ncnl(next);
+         chunk_t *tmp = chunk_get_next_ncnnl(next);
 
          if (chunk_is_token(tmp, CT_BRACE_OPEN))
          {
@@ -822,7 +806,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
     */
    if (chunk_is_token(next, CT_PAREN_OPEN))
    {
-      tmp = chunk_get_next_ncnl(next);
+      chunk_t *tmp = chunk_get_next_ncnnl(next);
 
       if (  language_is_set(LANG_C | LANG_CPP | LANG_OC)
          && chunk_is_token(tmp, CT_CARET))
@@ -872,20 +856,20 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             // If the open paren is followed by an ampersand, an optional word,
             // a close parenthesis, and an open square bracket, then it is an
             // array being passed by reference, not a cast
-            tmp = chunk_get_next_ncnl(next);
+            tmp = chunk_get_next_ncnnl(next);
 
             if (chunk_is_token(tmp, CT_AMP))
             {
-               auto tmp2 = chunk_get_next_ncnl(tmp);
+               auto tmp2 = chunk_get_next_ncnnl(tmp);
 
                if (chunk_is_token(tmp2, CT_WORD))
                {
-                  tmp2 = chunk_get_next_ncnl(tmp2);
+                  tmp2 = chunk_get_next_ncnnl(tmp2);
                }
 
                if (chunk_is_token(tmp2, CT_PAREN_CLOSE))
                {
-                  tmp2 = chunk_get_next_ncnl(tmp2);
+                  tmp2 = chunk_get_next_ncnnl(tmp2);
 
                   if (chunk_is_token(tmp2, CT_SQUARE_OPEN))
                   {
@@ -913,7 +897,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                   if (  get_chunk_parent_type(pc) == CT_NONE
                      && !pc->flags.test(PCF_IN_TYPEDEF))
                   {
-                     tmp = chunk_get_next_ncnl(next);
+                     tmp = chunk_get_next_ncnnl(next);
 
                      if (chunk_is_token(tmp, CT_PAREN_CLOSE))
                      {
@@ -975,15 +959,16 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       || chunk_is_token(pc, CT_FUNC_CALL_USER)
       || chunk_is_token(pc, CT_FUNC_PROTO))
    {
-      tmp = next;
+      chunk_t *tmp = next;
 
       if (chunk_is_token(tmp, CT_SQUARE_OPEN))
       {
          tmp = set_paren_parent(tmp, pc->type);
       }
-      else if (chunk_is_token(tmp, CT_TSQUARE) || get_chunk_parent_type(tmp) == CT_OPERATOR)
+      else if (  chunk_is_token(tmp, CT_TSQUARE)
+              || get_chunk_parent_type(tmp) == CT_OPERATOR)
       {
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
 
       if (tmp != nullptr)
@@ -1068,17 +1053,6 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       }
    }
 
-   if (  (  chunk_is_token(pc, CT_CLASS)
-         || chunk_is_token(pc, CT_STRUCT))
-      && pc->level == pc->brace_level)
-   {
-      if (  chunk_is_not_token(pc, CT_STRUCT)
-         || !language_is_set(LANG_C))
-      {
-         mark_class_ctor(pc);
-      }
-   }
-
    if (chunk_is_token(pc, CT_OC_CLASS))
    {
       handle_oc_class(pc);
@@ -1116,7 +1090,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
    if (language_is_set(LANG_CPP))
    {
-      chunk_t *nnext = chunk_get_next_ncnl(next);
+      chunk_t *nnext = chunk_get_next_ncnnl(next);
 
       // handle parent_type of assigns in special functions (ro5 + pure virtual)
       if (  pc->flags.test_any(PCF_IN_STRUCT | PCF_IN_CLASS)
@@ -1176,7 +1150,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
    // Check for stuff that can only occur at the start of an expression
    if (  pc->flags.test(PCF_EXPR_START)
-      || (prev->flags.test(PCF_EXPR_START) && get_chunk_parent_type(pc) == CT_OC_AT))
+      || (  prev->flags.test(PCF_EXPR_START)
+         && get_chunk_parent_type(pc) == CT_OC_AT))
    {
       // Change STAR, MINUS, and PLUS in the easy cases
       if (chunk_is_token(pc, CT_STAR))
@@ -1249,44 +1224,6 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       }
    }
 
-   // Detect a variable definition that starts with struct/enum/union/class
-   if (  !pc->flags.test(PCF_IN_TYPEDEF)
-      && get_chunk_parent_type(prev) != CT_CPP_CAST
-      && !prev->flags.test(PCF_IN_FCN_DEF)
-      && (  chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_UNION)
-         || chunk_is_token(pc, CT_CLASS)
-         || chunk_is_token(pc, CT_ENUM)))
-   {
-      tmp = chunk_skip_dc_member(next);
-
-      if (  chunk_is_token(tmp, CT_TYPE)
-         || chunk_is_token(tmp, CT_WORD))
-      {
-         set_chunk_parent(tmp, pc->type);
-         set_chunk_type(tmp, CT_TYPE);
-
-         tmp = chunk_get_next_ncnl(tmp);
-      }
-
-      if (chunk_is_token(tmp, CT_BRACE_OPEN))
-      {
-         tmp = chunk_skip_to_match(tmp);
-
-         if (tmp != nullptr)
-         {
-            tmp = chunk_get_next_ncnl(tmp);
-         }
-      }
-
-      if (  tmp != nullptr
-         && (  chunk_is_ptr_operator(tmp)
-            || chunk_is_token(tmp, CT_WORD)))
-      {
-         mark_variable_definition(tmp);
-      }
-   }
-
    /*
     * Change the parenthesis pair after a function/macro-function
     * CT_PAREN_OPEN => CT_FPAREN_OPEN
@@ -1364,7 +1301,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          // Add check for CT_DC_MEMBER CT_WORD CT_STAR sequence
          // to convert CT_WORD into CT_TYPE
          // and CT_STAR into CT_PTR_TYPE
-         // look for an assign backward to distinguish between
+         // look for an assign backward, fuction call, return to distinguish between
          //    double result = Constants::PI * factor;
          // and
          //    ::some::name * foo;
@@ -1373,24 +1310,27 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             && language_is_set(LANG_CPP))
          {
             // Issue 1402
-            bool assign_found = false;
-            tmp = pc;
+            bool    is_multiplication = false;
+            chunk_t *tmp              = pc;
 
             while (tmp != nullptr)
             {
-               if (chunk_is_token(tmp, CT_SEMICOLON))
+               if (  chunk_is_token(tmp, CT_SEMICOLON)
+                  || get_chunk_parent_type(tmp) == CT_CLASS)
                {
                   break;
                }
-               else if (chunk_is_token(tmp, CT_ASSIGN))
+               else if (  chunk_is_token(tmp, CT_ASSIGN)
+                       || chunk_is_token(tmp, CT_FUNC_CALL)
+                       || chunk_is_token(tmp, CT_RETURN))
                {
-                  assign_found = true;
+                  is_multiplication = true;
                   break;
                }
-               tmp = chunk_get_prev_ncnlni(tmp); // Issue #2279
+               tmp = chunk_get_prev_ncnnlni(tmp); // Issue #2279
             }
 
-            if (assign_found)
+            if (is_multiplication)
             {
                // double result = Constants::PI * factor;
                set_chunk_type(pc, CT_ARITH);
@@ -1461,7 +1401,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
          if (pc->flags.test(PCF_IN_TYPEDEF))  // Issue #1255/#633
          {
-            tmp = pc;
+            chunk_t *tmp = pc;
 
             while (tmp != nullptr)
             {
@@ -1474,7 +1414,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                {
                   set_chunk_type(pc, CT_PTR_TYPE);
                }
-               tmp = chunk_get_prev_ncnlni(tmp); // Issue #2279
+               tmp = chunk_get_prev_ncnnlni(tmp); // Issue #2279
             }
          }
       }
@@ -1524,7 +1464,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
             if (chunk_is_token(prev, CT_WORD))
             {
-               tmp = chunk_get_prev_ncnlni(prev); // Issue #2279
+               chunk_t *tmp = chunk_get_prev_ncnnlni(prev); // Issue #2279
 
                if (tmp != nullptr)
                {
@@ -1625,7 +1565,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             {
                // look for the opening parenthesis
                // Issue 1403
-               tmp = chunk_get_prev_type(pc, CT_FPAREN_OPEN, pc->level - 1);
+               chunk_t *tmp = chunk_get_prev_type(pc, CT_FPAREN_OPEN, pc->level - 1);
 
                if (  tmp != nullptr
                   && get_chunk_parent_type(tmp) != CT_FUNC_CTOR_VAR)
@@ -1650,7 +1590,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          if (pc->next->type == CT_STAR) // here *
          {
-            tmp = pc;
+            chunk_t *tmp = pc;
 
             while ((tmp != nullptr))
             {
@@ -1689,7 +1629,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
       auto const search_assign = [&pc, &is_preproc]()
       {
-         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnl(temp))
+         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnnl(temp))
          {
             LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
                     __func__, __LINE__, temp->orig_line, temp->orig_col,
@@ -1717,7 +1657,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       if (assign_found)
       {
          // it is a Type alias, alias template
-         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnl(temp))
+         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnnl(temp))
          {
             if (get_chunk_parent_type(temp) == CT_NONE)
             {
@@ -1741,7 +1681,42 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       && chunk_is_str(pc, "&&", 2)
       && chunk_ends_type(pc->prev))
    {
-      set_chunk_type(pc, CT_BYREF);
+      chunk_t *tmp = chunk_get_prev(pc);                 // Issue #2688
+      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
+              __func__, __LINE__, tmp->orig_line, tmp->orig_col,
+              tmp->text(), get_token_name(tmp->type));
+      log_pcf_flags(LFCNR, tmp->flags);
+      // look for a type
+
+      if (chunk_is_token(tmp, CT_TYPE))
+      {
+         log_pcf_flags(LFCNR, pc->flags);
+         set_chunk_type(pc, CT_BYREF);
+      }
+      // look next, is there a "assign" before the ";"
+      chunk_t *semi = chunk_get_next_type(pc, CT_SEMICOLON, pc->level);                // Issue #2688
+
+      if (semi != nullptr)
+      {
+         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
+                 __func__, __LINE__, semi->orig_line, semi->orig_col,
+                 semi->text(), get_token_name(semi->type));
+
+         for (chunk_t *test_it = pc; test_it != semi; test_it = chunk_get_next(test_it))
+         {
+            LOG_FMT(LFCNR, "%s(%d): test_it->orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
+                    __func__, __LINE__, test_it->orig_line, test_it->orig_col,
+                    test_it->text(), get_token_name(test_it->type));
+
+            if (chunk_is_token(test_it, CT_ASSIGN))
+            {
+               // the statement is an assigment
+               // && is before assign
+               set_chunk_type(pc, CT_BYREF);
+               break;
+            }
+         }
+      }
    }
 
    // Issue #1704
@@ -1763,7 +1738,7 @@ static void check_double_brace_init(chunk_t *bo1)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LJDBI, "%s(%d): orig_line is %zu, orig_col is %zu", __func__, __LINE__, bo1->orig_line, bo1->orig_col);
-   chunk_t *pc = chunk_get_prev_ncnlni(bo1);   // Issue #2279
+   chunk_t *pc = chunk_get_prev_ncnnlni(bo1);   // Issue #2279
 
    if (pc == nullptr)
    {
@@ -1829,7 +1804,7 @@ void fix_symbols(void)
    bool is_cpp  = language_is_set(LANG_CPP);
    bool is_java = language_is_set(LANG_JAVA);
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (  chunk_is_token(pc, CT_FUNC_WRAP)
          || chunk_is_token(pc, CT_TYPE_WRAP))
@@ -1841,10 +1816,10 @@ void fix_symbols(void)
       {
          mark_lvalue(pc);
       }
-      // a brace immediately preceeded by word in C++11 is an initializer list though it may also
-      // by a type casting initializer list if the word is really a type; sadly unucustify knows
-      // only builtin types and knows nothing of user-defined types
-      chunk_t *prev = chunk_get_prev_ncnlni(pc);   // Issue #2279
+      // a brace immediately preceded by word in C++11 is an initializer list though it may also
+      // by a type casting initializer list if the word is really a type; sadly uncrustify knows
+      // only built-in types and knows nothing of user-defined types
+      chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
 
       if (  is_cpp
          && chunk_is_token(pc, CT_BRACE_OPEN)
@@ -1862,7 +1837,7 @@ void fix_symbols(void)
 
       if (chunk_is_token(pc, CT_ATTRIBUTE))
       {
-         chunk_t *next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+         chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
          if (  next != nullptr
             && chunk_is_token(next, CT_PAREN_OPEN))
@@ -1882,19 +1857,19 @@ void fix_symbols(void)
    if (  chunk_is_newline(pc)
       || chunk_is_comment(pc))
    {
-      pc = chunk_get_next_ncnl(pc);
+      pc = chunk_get_next_ncnnl(pc);
    }
 
    while (pc != nullptr)
    {
       if (chunk_is_token(pc, CT_IGNORED))
       {
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
          continue;
       }
       LOG_FMT(LFCNR, "%s(%d): pc->orig_line       is %zu, orig_col is %zu, text() is '%s', type is %s\n",
               __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-      chunk_t *prev = chunk_get_prev_ncnlni(pc, scope_e::PREPROC);   // Issue #2279
+      chunk_t *prev = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);   // Issue #2279
 
       if (prev == nullptr)
       {
@@ -1906,7 +1881,7 @@ void fix_symbols(void)
          LOG_FMT(LFCNR, "%s(%d): prev(ni)->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                  __func__, __LINE__, prev->orig_line, prev->orig_col, prev->text(), get_token_name(prev->type));
       }
-      chunk_t *next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
       if (next == nullptr)
       {
@@ -1921,7 +1896,7 @@ void fix_symbols(void)
       LOG_FMT(LFCNR, "%s(%d): do_symbol_check(%s, %s, %s)\n",
               __func__, __LINE__, prev->text(), pc->text(), next->text());
       do_symbol_check(prev, pc, next);
-      pc = chunk_get_next_ncnl(pc);
+      pc = chunk_get_next_ncnnl(pc);
    }
    pawn_add_virtual_semicolons();
    process_returns();
@@ -1935,8 +1910,9 @@ void fix_symbols(void)
 
    while (pc != nullptr)
    {
+      char copy[1000];
       LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, parent_type is %s\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type), get_token_name(pc->parent_type));
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type), get_token_name(pc->parent_type));
 
       // Can't have a variable definition inside [ ]
       if (square_level < 0)
@@ -1957,11 +1933,11 @@ void fix_symbols(void)
       if (  chunk_is_token(pc, CT_EXTERN)
          && language_is_set(LANG_ALLC))
       {
-         chunk_t *next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
          if (chunk_is_token(next, CT_STRING))
          {
-            chunk_t *tmp = chunk_get_next_ncnl(next);
+            chunk_t *tmp = chunk_get_next_ncnnl(next);
 
             while (tmp != nullptr)
             {
@@ -1977,7 +1953,7 @@ void fix_symbols(void)
                   chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
                   break;
                }
-               tmp = chunk_get_next_ncnl(tmp);
+               tmp = chunk_get_next_ncnnl(tmp);
             }
          }
       }
@@ -2007,7 +1983,7 @@ void fix_symbols(void)
       // Issue #2279
       // Issue #2478
       LOG_FMT(LFCNR, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s, parent_type is %s\n   ",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type), get_token_name(pc->parent_type));
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type), get_token_name(pc->parent_type));
       log_pcf_flags(LFCNR, pc->flags);
 
       if (  (square_level < 0)
@@ -2017,14 +1993,16 @@ void fix_symbols(void)
             || chunk_is_token(pc, CT_TYPENAME)
             || chunk_is_token(pc, CT_DC_MEMBER)                         // Issue #2478
             || chunk_is_token(pc, CT_WORD))
+         && get_chunk_parent_type(pc) != CT_BIT_COLON
          && get_chunk_parent_type(pc) != CT_ENUM
+         && !pc->flags.test(PCF_IN_CLASS_BASE)
          && !pc->flags.test(PCF_IN_ENUM))
       {
          pc = fix_variable_definition(pc);
       }
       else
       {
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
       }
    }
 } // fix_symbols
@@ -2059,7 +2037,7 @@ static chunk_t *process_return(chunk_t *pc)
    chunk_t chunk;
 
    // grab next and bail if it is a semicolon
-   next = chunk_ppa_get_next_ncnl(pc);
+   next = chunk_ppa_get_next_ncnnl(pc);
 
    if (  next == nullptr
       || chunk_is_semicolon(next)
@@ -2084,7 +2062,7 @@ static chunk_t *process_return(chunk_t *pc)
       {
          return(nullptr);
       }
-      semi = chunk_ppa_get_next_ncnl(cpar);
+      semi = chunk_ppa_get_next_ncnnl(cpar);
 
       if (semi == nullptr)
       {
@@ -2180,7 +2158,8 @@ static chunk_t *process_return(chunk_t *pc)
             return(semi);
          }
 
-         if (chunk_is_semicolon(semi) && pc->level == semi->level)
+         if (  chunk_is_semicolon(semi)
+            && pc->level == semi->level)
          {
             break;
          }
@@ -2195,7 +2174,8 @@ static chunk_t *process_return(chunk_t *pc)
             return(semi);
          }
 
-         if (chunk_is_semicolon(semi) && pc->level == semi->level)
+         if (  chunk_is_semicolon(semi)
+            && pc->level == semi->level)
          {
             break;
          }
@@ -2209,6 +2189,7 @@ static chunk_t *process_return(chunk_t *pc)
       set_chunk_parent(&chunk, CT_RETURN);
       chunk.str         = "(";
       chunk.level       = pc->level;
+      chunk.pp_level    = pc->pp_level;
       chunk.brace_level = pc->brace_level;
       chunk.orig_line   = pc->orig_line;
       chunk.orig_col    = next->orig_col - 1;
@@ -2264,7 +2245,8 @@ void mark_comments(void)
 
       if (chunk_is_comment(cur))
       {
-         if (next_nl && prev_nl)
+         if (  next_nl
+            && prev_nl)
          {
             set_chunk_parent(cur, CT_COMMENT_WHOLE);
          }
@@ -2291,7 +2273,7 @@ static void handle_cpp_template(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *tmp = chunk_get_next_ncnl(pc);
+   chunk_t *tmp = chunk_get_next_ncnnl(pc);
 
    if (chunk_is_not_token(tmp, CT_ANGLE_OPEN))
    {
@@ -2318,14 +2300,14 @@ static void handle_cpp_template(chunk_t *pc)
 
    if (tmp != nullptr)
    {
-      tmp = chunk_get_next_ncnl(tmp);
+      tmp = chunk_get_next_ncnnl(tmp);
 
       if (chunk_is_token(tmp, CT_FRIEND))
       {
          // Account for a template friend declaration
          set_chunk_parent(tmp, CT_TEMPLATE);
 
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
 
       if (  chunk_is_token(tmp, CT_CLASS)
@@ -2352,7 +2334,7 @@ static void handle_cpp_lambda(chunk_t *sq_o)
    chunk_t *ret = nullptr;
 
    // abort if type of the previous token is not contained in this whitelist
-   chunk_t *prev = chunk_get_prev_ncnlni(sq_o);   // Issue #2279
+   chunk_t *prev = chunk_get_prev_ncnnlni(sq_o);   // Issue #2279
 
    if (  prev == nullptr
       || (  chunk_is_not_token(prev, CT_ASSIGN)
@@ -2373,19 +2355,19 @@ static void handle_cpp_lambda(chunk_t *sq_o)
       // make sure there is a ']'
       sq_c = chunk_skip_to_match(sq_o);
 
-      if (!sq_c)
+      if (sq_c == nullptr)
       {
          return;
       }
    }
-   chunk_t *pa_o = chunk_get_next_ncnl(sq_c);
+   chunk_t *pa_o = chunk_get_next_ncnnl(sq_c);
 
    // check to see if there is a lambda-specifier in the pa_o chunk;
    // assuming chunk is CT_EXECUTION_CONTEXT, ignore lambda-specifier
    while (chunk_is_token(pa_o, CT_EXECUTION_CONTEXT))
    {
       // set pa_o to next chunk after this specifier
-      pa_o = chunk_get_next_ncnl(pa_o);
+      pa_o = chunk_get_next_ncnnl(pa_o);
    }
 
    if (pa_o == nullptr)
@@ -2406,11 +2388,11 @@ static void handle_cpp_lambda(chunk_t *sq_o)
       }
    }
    // Check for 'mutable' keyword: '[]() mutable {}' or []() mutable -> ret {}
-   chunk_t *br_o = pa_c ? chunk_get_next_ncnl(pa_c) : pa_o;
+   chunk_t *br_o = pa_c ? chunk_get_next_ncnnl(pa_c) : pa_o;
 
    if (chunk_is_str(br_o, "mutable", 7))
    {
-      br_o = chunk_get_next_ncnl(br_o);
+      br_o = chunk_get_next_ncnnl(br_o);
    }
    //TODO: also check for exception and attribute between [] ... {}
 
@@ -2465,10 +2447,14 @@ static void handle_cpp_lambda(chunk_t *sq_o)
 
    if (pa_c != nullptr)
    {
-      set_chunk_type(pa_o, CT_FPAREN_OPEN);
+      set_chunk_type(pa_o, CT_LPAREN_OPEN);                    // Issue #3054
       set_chunk_parent(pa_o, CT_CPP_LAMBDA);
-      set_chunk_type(pa_c, CT_FPAREN_CLOSE);
+      chunk_set_parent(pa_o, sq_o);
+      chunk_set_parent(br_o, sq_o);
+      set_chunk_type(pa_c, CT_LPAREN_CLOSE);
       set_chunk_parent(pa_c, CT_CPP_LAMBDA);
+      chunk_set_parent(pa_c, sq_o);
+      chunk_set_parent(br_c, sq_o);
    }
    set_chunk_parent(br_o, CT_CPP_LAMBDA);
    set_chunk_parent(br_c, CT_CPP_LAMBDA);
@@ -2476,12 +2462,12 @@ static void handle_cpp_lambda(chunk_t *sq_o)
    if (ret != nullptr)
    {
       set_chunk_type(ret, CT_CPP_LAMBDA_RET);
-      ret = chunk_get_next_ncnl(ret);
+      ret = chunk_get_next_ncnnl(ret);
 
       while (ret != br_o)
       {
          make_type(ret);
-         ret = chunk_get_next_ncnl(ret);
+         ret = chunk_get_next_ncnnl(ret);
       }
    }
 
@@ -2490,7 +2476,7 @@ static void handle_cpp_lambda(chunk_t *sq_o)
       fix_fcn_def_params(pa_o);
    }
    //handle self calling lambda paren
-   chunk_t *call_pa_o = chunk_get_next_ncnl(br_c);
+   chunk_t *call_pa_o = chunk_get_next_ncnnl(br_c);
 
    if (chunk_is_token(call_pa_o, CT_PAREN_OPEN))
    {
@@ -2504,6 +2490,7 @@ static void handle_cpp_lambda(chunk_t *sq_o)
          set_chunk_parent(call_pa_c, CT_FUNC_CALL);
       }
    }
+   mark_cpp_lambda(sq_o);
 } // handle_cpp_lambda
 
 
@@ -2511,8 +2498,8 @@ static void handle_d_template(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *name = chunk_get_next_ncnl(pc);
-   chunk_t *po   = chunk_get_next_ncnl(name);
+   chunk_t *name = chunk_get_next_ncnnl(pc);
+   chunk_t *po   = chunk_get_next_ncnnl(name);
 
    //if (!name || (name->type != CT_WORD && name->type != CT_WORD))  Coverity CID 76000 Same on both sides, 2016-03-16
    if (  name == nullptr
@@ -2543,7 +2530,7 @@ static void handle_d_template(chunk_t *pc)
    }
    set_chunk_parent(tmp, CT_TEMPLATE);
 
-   tmp = chunk_get_next_ncnl(tmp);
+   tmp = chunk_get_next_ncnnl(tmp);
 
    if (chunk_is_not_token(tmp, CT_BRACE_OPEN))
    {
@@ -2555,7 +2542,7 @@ static void handle_d_template(chunk_t *pc)
 
    tmp = po;
 
-   while (  ((tmp = chunk_get_next_ncnl(tmp)) != nullptr)
+   while (  ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
          && tmp->level > po->level)
    {
       if (  chunk_is_token(tmp, CT_WORD)
@@ -2577,7 +2564,7 @@ chunk_t *skip_template_next(chunk_t *ang_open)
    if (chunk_is_token(ang_open, CT_ANGLE_OPEN))
    {
       chunk_t *pc = chunk_get_next_type(ang_open, CT_ANGLE_CLOSE, ang_open->level);
-      return(chunk_get_next_ncnl(pc));
+      return(chunk_get_next_ncnnl(pc));
    }
    return(ang_open);
 }
@@ -2604,7 +2591,7 @@ static void handle_oc_class(chunk_t *pc)
 
    if (get_chunk_parent_type(pc) == CT_OC_PROTOCOL)
    {
-      tmp = chunk_get_next_ncnl(pc);
+      tmp = chunk_get_next_ncnnl(pc);
 
       if (chunk_is_semicolon(tmp))
       {
@@ -2714,7 +2701,8 @@ static void handle_oc_class(chunk_t *pc)
             set_chunk_parent(tmp, CT_OC_CLASS);
          }
       }
-      else if (chunk_is_str(tmp, "-", 1) || chunk_is_str(tmp, "+", 1))
+      else if (  chunk_is_str(tmp, "-", 1)
+              || chunk_is_str(tmp, "+", 1))
       {
          as = angle_state_e::CLOSE;
 
@@ -2754,8 +2742,8 @@ static void handle_oc_class(chunk_t *pc)
 static void handle_oc_block_literal(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *prev = chunk_get_prev_ncnlni(pc);   // Issue #2279
-   chunk_t *next = chunk_get_next_ncnl(pc);
+   chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+   chunk_t *next = chunk_get_next_ncnnl(pc);
 
    if (  pc == nullptr
       || prev == nullptr
@@ -2777,7 +2765,7 @@ static void handle_oc_block_literal(chunk_t *pc)
    LOG_FMT(LOCBLK, "%s(%d):  + scan", __func__, __LINE__);
    chunk_t *tmp;
 
-   for (tmp = next; tmp; tmp = chunk_get_next_ncnl(tmp))
+   for (tmp = next; tmp; tmp = chunk_get_next_ncnnl(tmp))
    {
       /* handle '< protocol >' */
       if (chunk_is_str(tmp, "<", 1))
@@ -2798,7 +2786,7 @@ static void handle_oc_block_literal(chunk_t *pc)
                set_chunk_parent(tmp, CT_OC_PROTO_LIST);
             }
          }
-         tmp = chunk_get_next_ncnl(ac);
+         tmp = chunk_get_next_ncnnl(ac);
       }
       LOG_FMT(LOCBLK, " '%s'", tmp->text());
 
@@ -2855,11 +2843,11 @@ static void handle_oc_block_literal(chunk_t *pc)
          flag_parens(apo, PCF_OC_ATYPE, CT_FPAREN_OPEN, CT_OC_BLOCK_EXPR, true);
          fix_fcn_def_params(apo);
       }
-      lbp = chunk_get_prev_ncnlni(apo);   // Issue #2279
+      lbp = chunk_get_prev_ncnnlni(apo);   // Issue #2279
    }
    else
    {
-      lbp = chunk_get_prev_ncnlni(bbo);   // Issue #2279
+      lbp = chunk_get_prev_ncnnlni(bbo);   // Issue #2279
    }
 
    // mark the return type, if any
@@ -2869,7 +2857,7 @@ static void handle_oc_block_literal(chunk_t *pc)
       make_type(lbp);
       chunk_flags_set(lbp, PCF_OC_RTYPE);
       set_chunk_parent(lbp, CT_OC_BLOCK_EXPR);
-      lbp = chunk_get_prev_ncnlni(lbp);   // Issue #2279
+      lbp = chunk_get_prev_ncnnlni(lbp);   // Issue #2279
    }
    // mark the braces
    set_chunk_parent(bbo, CT_OC_BLOCK_EXPR);
@@ -2893,7 +2881,7 @@ static void handle_oc_block_type(chunk_t *pc)
       return;
    }
    // make sure we have '( ^'
-   chunk_t *tpo = chunk_get_prev_ncnlni(pc); // type paren open   Issue #2279
+   chunk_t *tpo = chunk_get_prev_ncnnlni(pc); // type paren open   Issue #2279
 
    if (chunk_is_paren_open(tpo))
    {
@@ -2901,10 +2889,10 @@ static void handle_oc_block_type(chunk_t *pc)
        * block type: 'RTYPE (^LABEL)(ARGS)'
        * LABEL is optional.
        */
-      chunk_t *tpc = chunk_skip_to_match(tpo);   // type close paren (after '^')
-      chunk_t *nam = chunk_get_prev_ncnlni(tpc); // name (if any) or '^'   Issue #2279
-      chunk_t *apo = chunk_get_next_ncnl(tpc);   // arg open paren
-      chunk_t *apc = chunk_skip_to_match(apo);   // arg close paren
+      chunk_t *tpc = chunk_skip_to_match(tpo);    // type close paren (after '^')
+      chunk_t *nam = chunk_get_prev_ncnnlni(tpc); // name (if any) or '^'   Issue #2279
+      chunk_t *apo = chunk_get_next_ncnnl(tpc);   // arg open paren
+      chunk_t *apc = chunk_skip_to_match(apo);    // arg close paren
 
       /*
        * If this is a block literal instead of a block type, 'nam'
@@ -2924,7 +2912,7 @@ static void handle_oc_block_type(chunk_t *pc)
 
       if (chunk_is_paren_close(apc))
       {
-         chunk_t   *aft = chunk_get_next_ncnl(apc);
+         chunk_t   *aft = chunk_get_next_ncnnl(apc);
          c_token_t pt;
 
          if (chunk_is_str(nam, "^", 1))
@@ -2956,7 +2944,7 @@ static void handle_oc_block_type(chunk_t *pc)
          set_chunk_type(apc, CT_FPAREN_CLOSE);
          set_chunk_parent(apc, CT_FUNC_PROTO);
          fix_fcn_def_params(apo);
-         mark_function_return_type(nam, chunk_get_prev_ncnlni(tpo), pt);   // Issue #2279
+         mark_function_return_type(nam, chunk_get_prev_ncnnlni(tpo), pt);   // Issue #2279
       }
    }
 } // handle_oc_block_type
@@ -2979,9 +2967,9 @@ static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flag
    set_chunk_parent(paren_close, ptype);
    chunk_flags_set(paren_close, flags);
 
-   for (chunk_t *cur = chunk_get_next_ncnl(paren_open);
+   for (chunk_t *cur = chunk_get_next_ncnnl(paren_open);
         cur != paren_close;
-        cur = chunk_get_next_ncnl(cur))
+        cur = chunk_get_next_ncnnl(cur))
    {
       LOG_FMT(LOCMSGD, " <%s|%s>", cur->text(), get_token_name(cur->type));
       chunk_flags_set(cur, flags);
@@ -2989,7 +2977,7 @@ static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flag
    }
 
    // returning the chunk after the paren close
-   return(chunk_get_next_ncnl(paren_close));
+   return(chunk_get_next_ncnnl(paren_close));
 }
 
 
@@ -3035,7 +3023,7 @@ static void handle_oc_message_decl(chunk_t *pc)
    // format: -(TYPE) NAME [: (TYPE)NAME
 
    // handle the return type
-   tmp = handle_oc_md_type(chunk_get_next_ncnl(pc), pt, PCF_OC_RTYPE, did_it);
+   tmp = handle_oc_md_type(chunk_get_next_ncnnl(pc), pt, PCF_OC_RTYPE, did_it);
 
    if (!did_it)
    {
@@ -3054,7 +3042,7 @@ static void handle_oc_message_decl(chunk_t *pc)
 
    set_chunk_type(tmp, pt);
    set_chunk_parent(tmp, pt);
-   pc = chunk_get_next_ncnl(tmp);
+   pc = chunk_get_next_ncnnl(tmp);
 
    LOG_FMT(LOCMSGD, " [%s]%s", pc->text(), get_token_name(pc->type));
 
@@ -3071,7 +3059,7 @@ static void handle_oc_message_decl(chunk_t *pc)
             || chunk_is_token(pc, pt))
          {
             set_chunk_parent(pc, pt);
-            pc = chunk_get_next_ncnl(pc);
+            pc = chunk_get_next_ncnnl(pc);
          }
 
          // a colon must be next
@@ -3081,7 +3069,7 @@ static void handle_oc_message_decl(chunk_t *pc)
          }
          set_chunk_type(pc, CT_OC_COLON);
          set_chunk_parent(pc, pt);
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
 
          // next is the type in parens
          LOG_FMT(LOCMSGD, "  (%s)", pc->text());
@@ -3098,7 +3086,7 @@ static void handle_oc_message_decl(chunk_t *pc)
          // we should now be on the arg name
          chunk_flags_set(pc, PCF_VAR_DEF);
          LOG_FMT(LOCMSGD, " arg[%s]", pc->text());
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
       }
    }
    LOG_FMT(LOCMSGD, " end[%s]", pc->text());
@@ -3127,7 +3115,8 @@ static void handle_oc_message_send(chunk_t *os)
 
    chunk_t *cs = chunk_get_next(os);
 
-   while (cs != nullptr && cs->level > os->level)
+   while (  cs != nullptr
+         && cs->level > os->level)
    {
       cs = chunk_get_next(cs);
    }
@@ -3140,20 +3129,20 @@ static void handle_oc_message_send(chunk_t *os)
    LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, os->orig_line, os->orig_col);
 
-   chunk_t *tmp = chunk_get_next_ncnl(cs);
+   chunk_t *tmp = chunk_get_next_ncnnl(cs);
 
    if (chunk_is_semicolon(tmp))
    {
       set_chunk_parent(tmp, CT_OC_MSG);
    }
    // expect a word first thing or [...]
-   tmp = chunk_get_next_ncnl(os);
+   tmp = chunk_get_next_ncnnl(os);
 
    if (  chunk_is_token(tmp, CT_SQUARE_OPEN)
       || chunk_is_token(tmp, CT_PAREN_OPEN)
       || chunk_is_token(tmp, CT_OC_AT))
    {
-      chunk_t *tt = chunk_get_next_ncnl(tmp);
+      chunk_t *tt = chunk_get_next_ncnnl(tmp);
 
       if (  chunk_is_token(tmp, CT_OC_AT)
          && tt != nullptr)
@@ -3190,16 +3179,16 @@ static void handle_oc_message_send(chunk_t *os)
       if (chunk_is_star(tmp)) // Issue #2722
       {
          set_chunk_type(tmp, CT_PTR_TYPE);
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
-      chunk_t *tt = chunk_get_next_ncnl(tmp);
+      chunk_t *tt = chunk_get_next_ncnnl(tmp);
 
       if (chunk_is_paren_open(tt))
       {
          LOG_FMT(LFCN, "%s(%d): (18) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
                  __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
          set_chunk_type(tmp, CT_FUNC_CALL);
-         tmp = chunk_get_prev_ncnlni(set_paren_parent(tt, CT_FUNC_CALL));   // Issue #2279
+         tmp = chunk_get_prev_ncnnlni(set_paren_parent(tt, CT_FUNC_CALL));   // Issue #2279
       }
       else
       {
@@ -3212,7 +3201,7 @@ static void handle_oc_message_send(chunk_t *os)
    chunk_flags_set(cs, PCF_IN_OC_MSG);
 
    // handle '< protocol >'
-   tmp = chunk_get_next_ncnl(tmp);
+   tmp = chunk_get_next_ncnnl(tmp);
 
    if (chunk_is_str(tmp, "<", 1))
    {
@@ -3232,7 +3221,7 @@ static void handle_oc_message_send(chunk_t *os)
             set_chunk_parent(tmp, CT_OC_PROTO_LIST);
          }
       }
-      tmp = chunk_get_next_ncnl(ac);
+      tmp = chunk_get_next_ncnnl(ac);
    }
    // handle 'object.property' and 'collection[index]'
    else
@@ -3241,12 +3230,12 @@ static void handle_oc_message_send(chunk_t *os)
       {
          if (chunk_is_token(tmp, CT_MEMBER))  // move past [object.prop1.prop2
          {
-            chunk_t *typ = chunk_get_next_ncnl(tmp);
+            chunk_t *typ = chunk_get_next_ncnnl(tmp);
 
             if (  chunk_is_token(typ, CT_WORD)
                || chunk_is_token(typ, CT_TYPE))
             {
-               tmp = chunk_get_next_ncnl(typ);
+               tmp = chunk_get_next_ncnnl(typ);
             }
             else
             {
@@ -3255,16 +3244,17 @@ static void handle_oc_message_send(chunk_t *os)
          }
          else if (chunk_is_token(tmp, CT_SQUARE_OPEN))  // move past [collection[index]
          {
-            chunk_t *tcs = chunk_get_next_ncnl(tmp);
+            chunk_t *tcs = chunk_get_next_ncnnl(tmp);
 
-            while (tcs != nullptr && tcs->level > tmp->level)
+            while (  tcs != nullptr
+                  && tcs->level > tmp->level)
             {
-               tcs = chunk_get_next_ncnl(tcs);
+               tcs = chunk_get_next_ncnnl(tcs);
             }
 
             if (chunk_is_token(tcs, CT_SQUARE_CLOSE))
             {
-               tmp = chunk_get_next_ncnl(tcs);
+               tmp = chunk_get_next_ncnnl(tcs);
             }
             else
             {
@@ -3281,7 +3271,7 @@ static void handle_oc_message_send(chunk_t *os)
    // [(self.foo.bar) method]
    if (chunk_is_paren_open(tmp))
    {
-      tmp = chunk_get_next_ncnl(chunk_skip_to_match(tmp));
+      tmp = chunk_get_next_ncnnl(chunk_skip_to_match(tmp));
    }
 
    if (  chunk_is_token(tmp, CT_WORD)
@@ -3539,6 +3529,7 @@ static void handle_oc_property_decl(chunk_t *os)
                set_chunk_parent(&endchunk, get_chunk_parent_type(curr_chunk));
                endchunk.str         = ",";
                endchunk.level       = curr_chunk->level;
+               endchunk.pp_level    = curr_chunk->pp_level;
                endchunk.brace_level = curr_chunk->brace_level;
                endchunk.orig_line   = curr_chunk->orig_line;
                endchunk.orig_col    = curr_chunk->orig_col;
@@ -3559,11 +3550,11 @@ static void handle_oc_property_decl(chunk_t *os)
          }
       }
    }
-   chunk_t *tmp = chunk_get_next_ncnl(os);
+   chunk_t *tmp = chunk_get_next_ncnnl(os);
 
    if (chunk_is_paren_open(tmp))
    {
-      tmp = chunk_get_next_ncnl(chunk_skip_to_match(tmp));
+      tmp = chunk_get_next_ncnnl(chunk_skip_to_match(tmp));
    }
    fix_variable_definition(tmp);
 } // handle_oc_property_decl
@@ -3575,7 +3566,8 @@ static void handle_cs_square_stmt(chunk_t *os)
 
    chunk_t *cs = chunk_get_next(os);
 
-   while (cs != nullptr && cs->level > os->level)
+   while (  cs != nullptr
+         && cs->level > os->level)
    {
       cs = chunk_get_next(cs);
    }
@@ -3600,7 +3592,7 @@ static void handle_cs_square_stmt(chunk_t *os)
       }
    }
 
-   tmp = chunk_get_next_ncnl(cs);
+   tmp = chunk_get_next_ncnnl(cs);
 
    if (tmp != nullptr)
    {
@@ -3618,7 +3610,7 @@ static void handle_cs_property(chunk_t *bro)
    bool    did_prop = false;
    chunk_t *pc      = bro;
 
-   while ((pc = chunk_get_prev_ncnlni(pc)) != nullptr)   // Issue #2279
+   while ((pc = chunk_get_prev_ncnnlni(pc)) != nullptr)   // Issue #2279
    {
       if (pc->level == bro->level)
       {
@@ -3722,17 +3714,17 @@ static void handle_wrap(chunk_t *pc)
 static void handle_proto_wrap(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *opp  = chunk_get_next_ncnl(pc);
-   chunk_t *name = chunk_get_next_ncnl(opp);
-   chunk_t *tmp  = chunk_get_next_ncnl(chunk_get_next_ncnl(name));
+   chunk_t *opp  = chunk_get_next_ncnnl(pc);
+   chunk_t *name = chunk_get_next_ncnnl(opp);
+   chunk_t *tmp  = chunk_get_next_ncnnl(chunk_get_next_ncnnl(name));
    chunk_t *clp  = chunk_skip_to_match(opp);
-   chunk_t *cma  = chunk_get_next_ncnl(clp);
+   chunk_t *cma  = chunk_get_next_ncnnl(clp);
 
-   if (  opp != nullptr
-      || name != nullptr
-      || tmp != nullptr
-      || clp != nullptr
-      || cma != nullptr
+   if (  opp == nullptr
+      || name == nullptr
+      || tmp == nullptr
+      || clp == nullptr
+      || cma == nullptr
       || (  chunk_is_not_token(name, CT_WORD)
          && chunk_is_not_token(name, CT_TYPE))
       || chunk_is_not_token(opp, CT_PAREN_OPEN))
@@ -3777,7 +3769,7 @@ static void handle_proto_wrap(chunk_t *pc)
    // Mark return type (TODO: move to own function)
    tmp = pc;
 
-   while ((tmp = chunk_get_prev_ncnlni(tmp)) != nullptr)   // Issue #2279
+   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
    {
       if (  !chunk_is_type(tmp)
          && chunk_is_not_token(tmp, CT_OPERATOR)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.h
index a34bf724..a34bf724 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_fix_mark.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.cpp
index bb3993a7..194f807e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_fix_mark.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.cpp
@@ -11,9 +11,10 @@
 #include "combine_skip.h"
 #include "combine_tools.h"
 #include "flag_parens.h"
-#include "lang_pawn.h"
 #include "log_rules.h"
 
+constexpr static auto LCURRENT = LCOMBINE;
+
 
 void fix_casts(chunk_t *start)
 {
@@ -35,7 +36,7 @@ void fix_casts(chunk_t *start)
    LOG_FMT(LCASTS, "%s(%d): start->text() is '%s', orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, start->text(), start->orig_line, start->orig_col);
 
-   prev = chunk_get_prev_ncnlni(start);   // Issue #2279
+   prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
 
    if (prev == nullptr)
    {
@@ -56,7 +57,7 @@ void fix_casts(chunk_t *start)
       return;
    }
    // Make sure there is only WORD, TYPE, and '*' or '^' before the close paren
-   pc    = chunk_get_next_ncnl(start);
+   pc    = chunk_get_next_ncnnl(start);
    first = pc;
 
    while (  pc != nullptr
@@ -96,7 +97,7 @@ void fix_casts(chunk_t *start)
          word_count--;
       }
       last = pc;
-      pc   = chunk_get_next_ncnl(pc);
+      pc   = chunk_get_next_ncnnl(pc);
       count++;
    }
 
@@ -149,7 +150,8 @@ void fix_casts(chunk_t *start)
       {
          detail = " -- upper case";
       }
-      else if (language_is_set(LANG_OC) && chunk_is_str(last, "id", 2))
+      else if (  language_is_set(LANG_OC)
+              && chunk_is_str(last, "id", 2))
       {
          detail = " -- Objective-C id";
       }
@@ -174,12 +176,12 @@ void fix_casts(chunk_t *start)
        *
        * Find the next non-open paren item.
        */
-      pc    = chunk_get_next_ncnl(paren_close);
+      pc    = chunk_get_next_ncnnl(paren_close);
       after = pc;
 
       do
       {
-         after = chunk_get_next_ncnl(after);
+         after = chunk_get_next_ncnnl(after);
       } while (chunk_is_token(after, CT_PAREN_OPEN));
 
       if (after == nullptr)
@@ -250,7 +252,7 @@ void fix_casts(chunk_t *start)
       }
    }
    // if the 'cast' is followed by a semicolon, comma, bool or close parenthesis, it isn't
-   pc = chunk_get_next_ncnl(paren_close);
+   pc = chunk_get_next_ncnnl(paren_close);
 
    if (pc == nullptr)
    {
@@ -274,7 +276,7 @@ void fix_casts(chunk_t *start)
 
    for (pc = first;
         pc != nullptr && pc != paren_close;
-        pc = chunk_get_next_ncnl(pc))
+        pc = chunk_get_next_ncnnl(pc))
    {
       set_chunk_parent(pc, CT_C_CAST);
       make_type(pc);
@@ -284,7 +286,7 @@ void fix_casts(chunk_t *start)
    LOG_FMT(LCASTS, " )%s\n", detail);
 
    // Mark the next item as an expression start
-   pc = chunk_get_next_ncnl(paren_close);
+   pc = chunk_get_next_ncnnl(paren_close);
 
    if (pc != nullptr)
    {
@@ -298,221 +300,6 @@ void fix_casts(chunk_t *start)
 } // fix_casts
 
 
-void fix_enum_struct_union(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-   chunk_t     *next;
-   chunk_t     *prev        = nullptr;
-   pcf_flags_t flags        = PCF_VAR_1ST_DEF;
-   auto const  in_fcn_paren = pc->flags & PCF_IN_FCN_DEF;
-
-   // Make sure this wasn't a cast
-   if (get_chunk_parent_type(pc) == CT_C_CAST)
-   {
-      return;
-   }
-   // the next item is either a type or open brace
-   next = chunk_get_next_ncnl(pc);
-
-   // the enum-key might be enum, enum class or enum struct (TODO)
-   if (chunk_is_token(next, CT_ENUM_CLASS))
-   {
-      next = chunk_get_next_ncnl(next); // get the next one
-   }
-
-   if (language_is_set(LANG_CPP))
-   {
-      next = skip_attribute_next(next); // get the next one
-   }
-
-   // the next item is either a type, an attribute (TODO), an identifier, a colon or open brace
-   if (  chunk_is_token(next, CT_TYPE)
-      || chunk_is_token(next, CT_WORD)
-      || chunk_is_token(next, CT_COLON))
-   {
-      // i.e. "enum xyz : unsigned int { ... };"
-      // i.e. "enum class xyz : unsigned int { ... };"
-      // i.e. "enum : unsigned int { ... };"
-      // xyz is a type
-
-      // save the type if it exists
-      if (chunk_is_not_token(next, CT_COLON))
-      {
-         set_chunk_parent(next, pc->type);
-         prev = next;
-         next = chunk_get_next_ncnl(next);
-      }
-
-      if (next == nullptr)
-      {
-         return;
-      }
-      set_chunk_parent(next, pc->type);
-      auto const is_struct_or_class =
-         (  chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_CLASS));
-
-      // next up is either a colon, open brace, or open parenthesis (pawn)
-      if (  language_is_set(LANG_PAWN)
-         && chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         next = set_paren_parent(next, CT_ENUM);
-      }
-      else if (chunk_is_token(next, CT_COLON))
-      {
-         if (chunk_is_token(pc, CT_ENUM))
-         {
-            // enum TYPE : INT_TYPE { ... };
-            next = chunk_get_next_ncnl(next);
-
-            if (next != nullptr)
-            {
-               make_type(next);
-               next = chunk_get_next_ncnl(next);
-
-               // enum TYPE : unsigned int { ... };
-               if (chunk_is_token(next, CT_TYPE))
-               {
-                  // get the next part of the type
-                  next = chunk_get_next_ncnl(next);
-               }
-            }
-         }
-         else if (is_struct_or_class)
-         {
-            next = skip_parent_types(next);
-         }
-      }
-      else if (  is_struct_or_class
-              && chunk_is_token(next, CT_PAREN_OPEN))
-      {
-         // Fix #1267 structure attributes
-         // struct __attribute__(align(x)) struct_name;
-         // skip to matching parenclose and make next token as type.
-         next = chunk_skip_to_match(next);
-         next = chunk_get_next_ncnl(next);
-         set_chunk_type(next, CT_TYPE);
-         set_chunk_parent(next, pc->type);
-      }
-
-      if (chunk_is_token(next, CT_SEMICOLON)) // c++ forward declaration
-      {
-         set_chunk_parent(next, pc->type);
-         flag_series(pc, prev, PCF_INCOMPLETE);
-         return;
-      }
-   }
-
-   if (chunk_is_token(next, CT_BRACE_OPEN))
-   {
-      auto const flag = [pc] {
-         switch (pc->type)
-         {
-         case CT_ENUM:
-            return(PCF_IN_ENUM);
-
-         case CT_STRUCT:
-            return(PCF_IN_STRUCT);
-
-         case CT_CLASS:
-            return(PCF_IN_CLASS);
-
-         default:
-            return(PCF_NONE);
-         }
-      }();
-
-      flag_parens(next, flag, CT_NONE, CT_NONE, false);
-
-      if (  chunk_is_token(pc, CT_UNION)
-         || chunk_is_token(pc, CT_STRUCT)
-         || chunk_is_token(pc, CT_CLASS))
-      {
-         mark_struct_union_body(next);
-      }
-      // Skip to the closing brace
-      set_chunk_parent(next, pc->type);
-      next   = chunk_get_next_type(next, CT_BRACE_CLOSE, pc->level);
-      flags |= PCF_VAR_INLINE;
-
-      if (next != nullptr)
-      {
-         set_chunk_parent(next, pc->type);
-         next = chunk_get_next_ncnl(next);
-      }
-      prev = nullptr;
-   }
-   // reset var name parent type
-   else if (next && prev)
-   {
-      set_chunk_parent(prev, CT_NONE);
-   }
-
-   if (  next == nullptr
-      || chunk_is_token(next, CT_PAREN_CLOSE))
-   {
-      return;
-   }
-
-   if (!chunk_is_semicolon(next))
-   {
-      // Pawn does not require a semicolon after an enum
-      if (language_is_set(LANG_PAWN))
-      {
-         return;
-      }
-
-      /*
-       * D does not require a semicolon after an enum, but we add one to make
-       * other code happy.
-       */
-      if (language_is_set(LANG_D))
-      {
-         next = pawn_add_vsemi_after(chunk_get_prev_ncnlni(next));   // Issue #2279
-      }
-   }
-
-   // We are either pointing to a ';' or a variable
-   while (  next != nullptr
-         && !chunk_is_semicolon(next)
-         && chunk_is_not_token(next, CT_ASSIGN)
-         && !(in_fcn_paren ^ (next->flags & PCF_IN_FCN_DEF)).test_any())
-   {
-      if (next->level == pc->level)
-      {
-         if (chunk_is_token(next, CT_WORD))
-         {
-            chunk_flags_set(next, flags);
-            flags &= ~PCF_VAR_1ST;   // clear the first flag for the next items
-            LOG_FMT(LCASTS, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', set PCF_VAR_1ST\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-         }
-
-         if (  chunk_is_token(next, CT_STAR)
-            || (  language_is_set(LANG_CPP)
-               && chunk_is_token(next, CT_CARET)))
-         {
-            set_chunk_type(next, CT_PTR_TYPE);
-         }
-
-         // If we hit a comma in a function param, we are done
-         if (  (  chunk_is_token(next, CT_COMMA)
-               || chunk_is_token(next, CT_FPAREN_CLOSE))
-            && (next->flags.test_any(PCF_IN_FCN_DEF | PCF_IN_FCN_CALL)))
-         {
-            return;
-         }
-      }
-      next = chunk_get_next_ncnl(next);
-   }
-
-   if (chunk_is_token(next, CT_SEMICOLON))
-   {
-      set_chunk_parent(next, pc->type);
-   }
-} // fix_enum_struct_union
-
-
 void fix_fcn_def_params(chunk_t *start)
 {
    LOG_FUNC_ENTRY();
@@ -524,9 +311,10 @@ void fix_fcn_def_params(chunk_t *start)
    LOG_FMT(LFCNP, "%s(%d): text() '%s', type is %s, on orig_line %zu, level is %zu\n",
            __func__, __LINE__, start->text(), get_token_name(start->type), start->orig_line, start->level);
 
-   while (start != nullptr && !chunk_is_paren_open(start))
+   while (  start != nullptr
+         && !chunk_is_paren_open(start))
    {
-      start = chunk_get_next_ncnl(start);
+      start = chunk_get_next_ncnnl(start);
    }
 
    if (start == nullptr)// Coverity CID 76003, 1100782
@@ -534,15 +322,17 @@ void fix_fcn_def_params(chunk_t *start)
       return;
    }
    // ensure start chunk holds a single '(' character
-   assert((start->len() == 1) && (start->str[0] == '('));
+   assert(  (start->len() == 1)
+         && (start->str[0] == '('));
 
    ChunkStack cs;
    size_t     level = start->level + 1;
    chunk_t    *pc   = start;
 
-   while ((pc = chunk_get_next_ncnl(pc)) != nullptr)
+   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
    {
-      if (  ((start->len() == 1) && (start->str[0] == ')'))
+      if (  (  (start->len() == 1)
+            && (start->str[0] == ')'))
          || pc->level < level)
       {
          LOG_FMT(LFCNP, "%s(%d): bailed on text() '%s', on orig_line %zu\n",
@@ -558,7 +348,9 @@ void fix_fcn_def_params(chunk_t *start)
          continue;
       }
 
-      if (chunk_is_star(pc) || chunk_is_msref(pc) || chunk_is_nullable(pc))
+      if (  chunk_is_star(pc)
+         || chunk_is_msref(pc)
+         || chunk_is_nullable(pc))
       {
          set_chunk_type(pc, CT_PTR_TYPE);
          cs.Push_Back(pc);
@@ -600,7 +392,7 @@ void fix_type_cast(chunk_t *start)
    LOG_FUNC_ENTRY();
    chunk_t *pc;
 
-   pc = chunk_get_next_ncnl(start);
+   pc = chunk_get_next_ncnnl(start);
 
    if (  pc == nullptr
       || chunk_is_not_token(pc, CT_ANGLE_OPEN))
@@ -608,13 +400,13 @@ void fix_type_cast(chunk_t *start)
       return;
    }
 
-   while (  ((pc = chunk_get_next_ncnl(pc)) != nullptr)
+   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
          && pc->level >= start->level)
    {
       if (  pc->level == start->level
          && chunk_is_token(pc, CT_ANGLE_CLOSE))
       {
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
 
          if (pc == nullptr)
          {
@@ -650,9 +442,9 @@ void fix_typedef(chunk_t *start)
     * Mark everything in the typedef and scan for ")(", which makes it a
     * function type
     */
-   for (chunk_t *next = chunk_get_next_ncnl(start, scope_e::PREPROC)
+   for (chunk_t *next = chunk_get_next_ncnnl(start, scope_e::PREPROC)
         ; next != nullptr && next->level >= start->level
-        ; next = chunk_get_next_ncnl(next, scope_e::PREPROC))
+        ; next = chunk_get_next_ncnnl(next, scope_e::PREPROC))
    {
       chunk_flags_set(next, PCF_IN_TYPEDEF);
 
@@ -692,12 +484,13 @@ void fix_typedef(chunk_t *start)
 
    // avoid interpreting typedef NS_ENUM (NSInteger, MyEnum) as a function def
    if (  last_op != nullptr
-      && !(language_is_set(LANG_OC) && get_chunk_parent_type(last_op) == CT_ENUM))
+      && !(  language_is_set(LANG_OC)
+          && get_chunk_parent_type(last_op) == CT_ENUM))
    {
       flag_parens(last_op, PCF_NONE, CT_FPAREN_OPEN, CT_TYPEDEF, false);
       fix_fcn_def_params(last_op);
 
-      the_type = chunk_get_prev_ncnlni(last_op, scope_e::PREPROC);   // Issue #2279
+      the_type = chunk_get_prev_ncnnlni(last_op, scope_e::PREPROC);   // Issue #2279
 
       if (the_type == nullptr)
       {
@@ -709,7 +502,7 @@ void fix_typedef(chunk_t *start)
       {
          open_paren = chunk_skip_to_match_rev(the_type);
          mark_function_type(the_type);
-         the_type = chunk_get_prev_ncnlni(the_type, scope_e::PREPROC);   // Issue #2279
+         the_type = chunk_get_prev_ncnnlni(the_type, scope_e::PREPROC);   // Issue #2279
 
          if (the_type == nullptr)
          {
@@ -729,7 +522,8 @@ void fix_typedef(chunk_t *start)
       // If we are aligning on the open parenthesis, grab that instead
       log_rule_B("align_typedef_func");
 
-      if (open_paren != nullptr && options::align_typedef_func() == 1)
+      if (  open_paren != nullptr
+         && options::align_typedef_func() == 1)
       {
          the_type = open_paren;
       }
@@ -748,7 +542,7 @@ void fix_typedef(chunk_t *start)
     * Skip over enum/struct/union stuff, as we know it isn't a return type
     * for a function type
     */
-   chunk_t *after = chunk_get_next_ncnl(start, scope_e::PREPROC);
+   chunk_t *after = chunk_get_next_ncnnl(start, scope_e::PREPROC);
 
    if (after == nullptr)
    {
@@ -769,7 +563,7 @@ void fix_typedef(chunk_t *start)
       return;
    }
    // We have a struct/union/enum, next should be either a type or {
-   chunk_t *next = chunk_get_next_ncnl(after, scope_e::PREPROC);
+   chunk_t *next = chunk_get_next_ncnnl(after, scope_e::PREPROC);
 
    if (next == nullptr)
    {
@@ -778,7 +572,7 @@ void fix_typedef(chunk_t *start)
 
    if (chunk_is_token(next, CT_TYPE))
    {
-      next = chunk_get_next_ncnl(next, scope_e::PREPROC);
+      next = chunk_get_next_ncnnl(next, scope_e::PREPROC);
 
       if (next == nullptr)
       {
@@ -843,7 +637,7 @@ chunk_t *fix_variable_definition(chunk_t *start)
       LOG_FMT(LFVD, "%s(%d):   1:pc->text() '%s', type is %s\n",
               __func__, __LINE__, pc->text(), get_token_name(pc->type));
       cs.Push_Back(pc);
-      pc = chunk_get_next_ncnl(pc);
+      pc = chunk_get_next_ncnnl(pc);
 
       if (pc == nullptr)
       {
@@ -889,6 +683,11 @@ chunk_t *fix_variable_definition(chunk_t *start)
    }
    LOG_FMT(LFVD, "%s(%d): end->type is %s\n", __func__, __LINE__, get_token_name(end->type));
 
+   if (chunk_is_token(end, CT_FUNC_CTOR_VAR))                // Issue #3010
+   {
+      return(end);
+   }
+
    if (  cs.Len() == 1
       && chunk_is_token(end, CT_BRACE_OPEN)
       && get_chunk_parent_type(end) == CT_BRACED_INIT_LIST)
@@ -973,250 +772,12 @@ chunk_t *fix_variable_definition(chunk_t *start)
 
    if (chunk_is_token(end, CT_COMMA))
    {
-      return(chunk_get_next_ncnl(end));
+      return(chunk_get_next_ncnnl(end));
    }
    return(skip_to_next_statement(end));
 } // fix_variable_definition
 
 
-void mark_class_ctor(chunk_t *start)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, start is '%s', parent_type is %s\n",
-           __func__, __LINE__, start->orig_line, start->orig_col, start->text(),
-           get_token_name(get_chunk_parent_type(start)));
-   log_pcf_flags(LFTOR, start->flags);
-
-   chunk_t *pclass = chunk_get_next_ncnl(start, scope_e::PREPROC);
-
-   if (pclass == nullptr)
-   {
-      return;
-   }
-   LOG_FMT(LFTOR, "%s(%d): pclass is '%s'\n",
-           __func__, __LINE__, pclass->text());
-   log_pcf_flags(LFTOR, pclass->flags);
-
-   if (language_is_set(LANG_CPP))
-   {
-      pclass = skip_attribute_next(pclass);
-      LOG_FMT(LFTOR, "%s(%d): pclass is '%s'\n",
-              __func__, __LINE__, pclass->text());
-   }
-
-   if (get_chunk_parent_type(start) == CT_TEMPLATE)
-   {
-      // look after the class name
-      chunk_t *openingTemplate = chunk_get_next_ncnl(pclass);
-      LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, openingTemplate is '%s', type is %s\n",
-              __func__, __LINE__, openingTemplate->orig_line, openingTemplate->orig_col,
-              openingTemplate->text(), get_token_name(openingTemplate->type));
-
-      if (chunk_is_token(openingTemplate, CT_ANGLE_OPEN))
-      {
-         chunk_t *closingTemplate = chunk_skip_to_match(openingTemplate);
-         LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, closingTemplate is '%s', type is %s\n",
-                 __func__, __LINE__, closingTemplate->orig_line, closingTemplate->orig_col,
-                 closingTemplate->text(), get_token_name(closingTemplate->type));
-         chunk_t *thirdToken = chunk_get_next_ncnl(closingTemplate);
-         LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, thirdToken is '%s', type is %s\n",
-                 __func__, __LINE__, thirdToken->orig_line, thirdToken->orig_col,
-                 thirdToken->text(), get_token_name(thirdToken->type));
-
-         if (chunk_is_token(thirdToken, CT_DC_MEMBER))
-         {
-            pclass = chunk_get_next_ncnl(thirdToken);
-            LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, orig_col is %zu, pclass is '%s', type is %s\n",
-                    __func__, __LINE__, pclass->orig_line, pclass->orig_col,
-                    pclass->text(), get_token_name(pclass->type));
-         }
-      }
-   }
-   pclass = skip_attribute_next(pclass);
-   LOG_FMT(LFTOR, "%s(%d): pclass is '%s'\n",
-           __func__, __LINE__, pclass->text());
-
-   if (chunk_is_token(pclass, CT_DECLSPEC))  // Issue 1289
-   {
-      pclass = chunk_get_next_ncnl(pclass);
-      LOG_FMT(LFTOR, "%s(%d): pclass is '%s'\n",
-              __func__, __LINE__, pclass->text());
-
-      if (chunk_is_token(pclass, CT_PAREN_OPEN))
-      {
-         pclass = chunk_get_next_ncnl(chunk_skip_to_match(pclass));
-         LOG_FMT(LFTOR, "%s(%d): pclass is '%s'\n",
-                 __func__, __LINE__, pclass->text());
-      }
-   }
-
-   if (  pclass == nullptr
-      || (  chunk_is_not_token(pclass, CT_TYPE)
-         && chunk_is_not_token(pclass, CT_WORD)))
-   {
-      return;
-   }
-   chunk_t *next = chunk_get_next_ncnl(pclass, scope_e::PREPROC);
-
-   while (  chunk_is_token(next, CT_TYPE)
-         || chunk_is_token(next, CT_WORD)
-         || chunk_is_token(next, CT_DC_MEMBER))
-   {
-      pclass = next;
-      LOG_FMT(LFTOR, "%s(%d): pclass is '%s'\n",
-              __func__, __LINE__, pclass->text());
-      next = chunk_get_next_ncnl(next, scope_e::PREPROC);
-   }
-   chunk_t *pc   = chunk_get_next_ncnl(pclass, scope_e::PREPROC);
-   size_t  level = pclass->brace_level + 1;
-
-   if (pc == nullptr)
-   {
-      LOG_FMT(LFTOR, "%s(%d): Called on %s on orig_line %zu. Bailed on NULL\n",
-              __func__, __LINE__, pclass->text(), pclass->orig_line);
-      return;
-   }
-   // Add the class name
-   ChunkStack cs;
-
-   cs.Push_Back(pclass);
-
-   LOG_FMT(LFTOR, "%s(%d): Called on %s on orig_line %zu (next is '%s')\n",
-           __func__, __LINE__, pclass->text(), pclass->orig_line, pc->text());
-
-   // detect D template class: "class foo(x) { ... }"
-   if (  language_is_set(LANG_D)
-      && chunk_is_token(next, CT_PAREN_OPEN))              // Coverity CID 76004
-   {
-      set_chunk_parent(next, CT_TEMPLATE);
-
-      next = get_d_template_types(cs, next);
-
-      if (chunk_is_token(next, CT_PAREN_CLOSE))
-      {
-         set_chunk_parent(next, CT_TEMPLATE);
-      }
-   }
-   // Find the open brace, abort on semicolon
-   pcf_flags_t flags = PCF_NONE;
-
-   while (  pc != nullptr
-         && chunk_is_not_token(pc, CT_BRACE_OPEN))
-   {
-      LOG_FMT(LFTOR, " [%s]", pc->text());
-
-      flags = mark_where_chunk(pc, start->type, flags);
-
-      if (!flags.test(PCF_IN_WHERE_SPEC) && chunk_is_str(pc, ":", 1))
-      {
-         set_chunk_type(pc, CT_CLASS_COLON);
-         flags |= PCF_IN_CLASS_BASE;
-         LOG_FMT(LFTOR, "%s(%d): class colon on line %zu\n",
-                 __func__, __LINE__, pc->orig_line);
-      }
-
-      if (chunk_is_semicolon(pc))
-      {
-         LOG_FMT(LFTOR, "%s(%d): bailed on semicolon on line %zu\n",
-                 __func__, __LINE__, pc->orig_line);
-         return;
-      }
-      chunk_flags_set(pc, flags);
-      pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
-   }
-
-   if (pc == nullptr)
-   {
-      LOG_FMT(LFTOR, "%s(%d): bailed on NULL\n", __func__, __LINE__);
-      return;
-   }
-   set_paren_parent(pc, start->type);
-   chunk_flags_set(pc, PCF_IN_CLASS);
-
-   pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
-   LOG_FMT(LFTOR, "%s(%d): pclass is '%s'\n",
-           __func__, __LINE__, pclass->text());
-
-   while (pc != nullptr)
-   {
-      LOG_FMT(LFTOR, "%s(%d): pc is '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-      chunk_flags_set(pc, PCF_IN_CLASS);
-
-      if (  pc->brace_level > level
-         || pc->level > pc->brace_level
-         || pc->flags.test(PCF_IN_PREPROC))
-      {
-         pc = chunk_get_next_ncnl(pc);
-         continue;
-      }
-
-      if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-         && pc->brace_level < level)
-      {
-         LOG_FMT(LFTOR, "%s(%d): orig_line is %zu, Hit brace close\n",
-                 __func__, __LINE__, pc->orig_line);
-         pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
-
-         if (chunk_is_token(pc, CT_SEMICOLON))
-         {
-            set_chunk_parent(pc, start->type);
-         }
-         return;
-      }
-      next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
-
-      if (chunkstack_match(cs, pc))
-      {
-         LOG_FMT(LFTOR, "%s(%d): pc is '%s', orig_line is %zu, orig_col is %zu\n",
-                 __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
-         // Issue #1333 Formatter removes semicolon after variable initializer at class level(C#)
-         // if previous chunk is 'new' operator it is variable initializer not a CLASS_FUNC_DEF.
-         chunk_t *prev = chunk_get_prev_ncnlni(pc, scope_e::PREPROC);   // Issue #2279
-         LOG_FMT(LFTOR, "%s(%d): prev is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                 __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col, get_token_name(prev->type));
-
-         // Issue #1003, next->type should not be CT_FPAREN_OPEN
-         if (chunk_is_not_token(prev, CT_NEW))
-         {
-            bool is_func_class_def = false;
-
-            if (chunk_is_token(next, CT_PAREN_OPEN))
-            {
-               is_func_class_def = true;
-            }
-            else if (chunk_is_token(next, CT_ANGLE_OPEN))          // Issue # 1737
-            {
-               chunk_t *closeAngle    = chunk_skip_to_match(next);
-               chunk_t *afterTemplate = chunk_get_next(closeAngle);
-
-               if (chunk_is_token(afterTemplate, CT_PAREN_OPEN))
-               {
-                  is_func_class_def = true;
-               }
-            }
-            else
-            {
-               LOG_FMT(LFTOR, "%s(%d): text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-               make_type(pc);
-            }
-
-            if (is_func_class_def)
-            {
-               set_chunk_type(pc, CT_FUNC_CLASS_DEF);
-               LOG_FMT(LFTOR, "%s(%d): text() is '%s', orig_line is %zu, orig_col is %zu, type is %s, Marked CTor/DTor\n",
-                       __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, get_token_name(pc->type));
-               mark_cpp_constructor(pc);
-            }
-         }
-      }
-      pc = next;
-   }
-} // mark_class_ctor
-
-
 void mark_cpp_constructor(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
@@ -1226,7 +787,7 @@ void mark_cpp_constructor(chunk_t *pc)
    chunk_t *var;
    bool    is_destr = false;
 
-   tmp = chunk_get_prev_ncnlni(pc);   // Issue #2279
+   tmp = chunk_get_prev_ncnnlni(pc);   // Issue #2279
 
    if (  chunk_is_token(tmp, CT_INV)
       || chunk_is_token(tmp, CT_DESTRUCTOR))
@@ -1241,7 +802,7 @@ void mark_cpp_constructor(chunk_t *pc)
            pc->text(), get_token_name(pc->type),
            tmp->text(), get_token_name(tmp->type));
 
-   paren_open = skip_template_next(chunk_get_next_ncnl(pc));
+   paren_open = skip_template_next(chunk_get_next_ncnnl(pc));
 
    if (!chunk_is_str(paren_open, "(", 1))
    {
@@ -1268,19 +829,21 @@ void mark_cpp_constructor(chunk_t *pc)
       LOG_FMT(LFTOR, "%s(%d): tmp is '%s', orig_line is %zu, orig_col is %zu\n",
               __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col);
       chunk_flags_set(tmp, PCF_IN_CONST_ARGS);
-      tmp = chunk_get_next_ncnl(tmp);
+      tmp = chunk_get_next_ncnnl(tmp);
 
-      if (chunk_is_str(tmp, ":", 1) && tmp->level == paren_open->level)
+      if (  chunk_is_str(tmp, ":", 1)
+         && tmp->level == paren_open->level)
       {
          set_chunk_type(tmp, CT_CONSTR_COLON);
          hit_colon = true;
       }
 
       if (  hit_colon
-         && (chunk_is_paren_open(tmp) || chunk_is_opening_brace(tmp))
+         && (  chunk_is_paren_open(tmp)
+            || chunk_is_opening_brace(tmp))
          && tmp->level == paren_open->level)
       {
-         var = skip_template_prev(chunk_get_prev_ncnlni(tmp));   // Issue #2279
+         var = skip_template_prev(chunk_get_prev_ncnnlni(tmp));   // Issue #2279
 
          if (  chunk_is_token(var, CT_TYPE)
             || chunk_is_token(var, CT_WORD))
@@ -1305,22 +868,40 @@ void mark_cpp_constructor(chunk_t *pc)
       LOG_FMT(LFCN, "%s(%d):  Marked '%s' as FUNC_CLASS_PROTO on orig_line %zu, orig_col %zu\n",
               __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
    }
-   tmp = chunk_get_prev_ncnlni(pc); // Issue #2907
+   tmp = chunk_get_prev_ncnnlni(pc); // Issue #2907
 
    if (chunk_is_token(tmp, CT_DESTRUCTOR))
    {
       set_chunk_parent(tmp, pc->type);
-      tmp = chunk_get_prev_ncnlni(tmp);
+      tmp = chunk_get_prev_ncnnlni(tmp);
    }
 
    while (chunk_is_token(tmp, CT_QUALIFIER))
    {
       set_chunk_parent(tmp, pc->type);
-      tmp = chunk_get_prev_ncnlni(tmp);
+      tmp = chunk_get_prev_ncnnlni(tmp);
    }
 } // mark_cpp_constructor
 
 
+void mark_cpp_lambda(chunk_t *square_open)
+{
+   if (  chunk_is_token(square_open, CT_SQUARE_OPEN)
+      && get_chunk_parent_type(square_open) == CT_CPP_LAMBDA)
+   {
+      auto *brace_close = chunk_get_next_type(square_open, CT_BRACE_CLOSE, square_open->level);
+
+      if (get_chunk_parent_type(brace_close) == CT_CPP_LAMBDA)
+      {
+         for (auto *pc = square_open; pc != brace_close; pc = chunk_get_next_ncnnl(pc))
+         {
+            chunk_flags_set(pc, PCF_IN_LAMBDA);
+         }
+      }
+   }
+} // mark_cpp_lambda
+
+
 void mark_define_expressions(void)
 {
    LOG_FUNC_ENTRY();
@@ -1467,7 +1048,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
          {
             first = pc;
          }
-         pc = chunk_get_prev_ncnlni(pc);   // Issue #2279
+         pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
       }
       LOG_FMT(LFCNR, "%s(%d): marking returns...", __func__, __LINE__);
 
@@ -1490,7 +1071,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
          {
             set_chunk_parent(pc, parent_type);
          }
-         chunk_t *prev = chunk_get_prev_ncnlni(pc);   // Issue #2279
+         chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
 
          if (  !is_return_tuple
             || chunk_is_not_token(pc, CT_WORD)
@@ -1504,7 +1085,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
          {
             break;
          }
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
 
          //template angles should keep parent type CT_TEMPLATE
          if (chunk_is_token(pc, CT_ANGLE_OPEN))
@@ -1515,15 +1096,17 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
             {
                break;
             }
-            pc = chunk_get_next_ncnl(pc);
+            pc = chunk_get_next_ncnnl(pc);
          }
       }
       LOG_FMT(LFCNR, "\n");
 
       // Back up and mark parent type on friend declarations
-      if (parent_type != CT_NONE && first && first->flags.test(PCF_IN_CLASS))
+      if (  parent_type != CT_NONE
+         && first
+         && first->flags.test(PCF_IN_CLASS))
       {
-         pc = chunk_get_prev_ncnlni(first);   // Issue #2279
+         pc = chunk_get_prev_ncnnlni(first);   // Issue #2279
 
          if (chunk_is_token(pc, CT_FRIEND))
          {
@@ -1532,7 +1115,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
             // A friend might be preceded by a template specification, as in:
             //   template <...> friend type func(...);
             // If so, we need to mark that also
-            pc = chunk_get_prev_ncnlni(pc);   // Issue #2279
+            pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
 
             if (chunk_is_token(pc, CT_ANGLE_CLOSE))
             {
@@ -1561,8 +1144,8 @@ void mark_function(chunk_t *pc)
    }
    LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s'\n",
            __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-   chunk_t *prev = chunk_get_prev_ncnlni(pc);   // Issue #2279
-   chunk_t *next = chunk_get_next_ncnlnp(pc);
+   chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+   chunk_t *next = chunk_get_next_ncnnlnp(pc);
 
    if (next == nullptr)
    {
@@ -1593,7 +1176,7 @@ void mark_function(chunk_t *pc)
       {
          tmp = pc;
 
-         while ((tmp = chunk_get_prev_ncnlni(tmp)) != nullptr)   // Issue #2279
+         while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
          {
             if (  chunk_is_token(tmp, CT_BRACE_CLOSE)
                || chunk_is_token(tmp, CT_BRACE_OPEN)             // Issue 575
@@ -1653,7 +1236,7 @@ void mark_function(chunk_t *pc)
             && chunk_is_not_token(pc, CT_FUNC_CALL))
          {
             // Mark the return type
-            while (  (tmp = chunk_get_next_ncnl(tmp)) != pc
+            while (  (tmp = chunk_get_next_ncnnl(tmp)) != pc
                   && tmp != nullptr)
             {
                make_type(tmp); // Mark the return type
@@ -1664,7 +1247,7 @@ void mark_function(chunk_t *pc)
 
    if (chunk_is_ptr_operator(next))
    {
-      next = chunk_get_next_ncnlnp(next);
+      next = chunk_get_next_ncnnlnp(next);
 
       if (next == nullptr)
       {
@@ -1726,7 +1309,7 @@ void mark_function(chunk_t *pc)
     *
     * Otherwise, it must be chained function calls.
     */
-   tmp = chunk_get_next_ncnl(paren_close);
+   tmp = chunk_get_next_ncnnl(paren_close);
 
    if (  tmp != nullptr
       && chunk_is_str(tmp, "(", 1))
@@ -1736,20 +1319,20 @@ void mark_function(chunk_t *pc)
       chunk_t *tmp3;
 
       // skip over any leading class/namespace in: "T(F::*A)();"
-      tmp1 = chunk_get_next_ncnl(next);
+      tmp1 = chunk_get_next_ncnnl(next);
 
       while (tmp1 != nullptr)
       {
-         tmp2 = chunk_get_next_ncnl(tmp1);
+         tmp2 = chunk_get_next_ncnnl(tmp1);
 
          if (  !chunk_is_word(tmp1)
             || chunk_is_not_token(tmp2, CT_DC_MEMBER))
          {
             break;
          }
-         tmp1 = chunk_get_next_ncnl(tmp2);
+         tmp1 = chunk_get_next_ncnnl(tmp2);
       }
-      tmp2 = chunk_get_next_ncnl(tmp1);
+      tmp2 = chunk_get_next_ncnnl(tmp1);
 
       if (chunk_is_str(tmp2, ")", 1))
       {
@@ -1758,15 +1341,17 @@ void mark_function(chunk_t *pc)
       }
       else
       {
-         tmp3 = chunk_get_next_ncnl(tmp2);
+         tmp3 = chunk_get_next_ncnnl(tmp2);
       }
       tmp3 = chunk_get_next_ssq(tmp3);
 
       if (  chunk_is_str(tmp3, ")", 1)
          && (  chunk_is_star(tmp1)
             || chunk_is_msref(tmp1)
-            || (language_is_set(LANG_OC) && chunk_is_token(tmp1, CT_CARET)))
-         && (tmp2 == nullptr || chunk_is_token(tmp2, CT_WORD)))
+            || (  language_is_set(LANG_OC)
+               && chunk_is_token(tmp1, CT_CARET)))
+         && (  tmp2 == nullptr
+            || chunk_is_token(tmp2, CT_WORD)))
       {
          if (tmp2)
          {
@@ -1856,12 +1441,12 @@ void mark_function(chunk_t *pc)
 
          destr = prev;
          // Point to the item previous to the class name
-         prev = chunk_get_prev_ncnlnp(prev);
+         prev = chunk_get_prev_ncnnlnp(prev);
       }
 
       if (chunk_is_token(prev, CT_DC_MEMBER))
       {
-         prev = chunk_get_prev_ncnlnp(prev);
+         prev = chunk_get_prev_ncnnlnp(prev);
          LOG_FMT(LFCN, "%s(%d): prev->text() is '%s', orig_line is %zu, orig_col is %zu, type is %s\n",
                  __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
                  get_token_name(prev->type));
@@ -1893,7 +1478,7 @@ void mark_function(chunk_t *pc)
                return;
             }
             // Point to the item previous to the class name
-            prev = chunk_get_prev_ncnlnp(prev);
+            prev = chunk_get_prev_ncnnlnp(prev);
          }
       }
    }
@@ -1959,7 +1544,7 @@ void mark_function(chunk_t *pc)
 
          if (prev->flags.test(PCF_IN_PREPROC))
          {
-            prev = chunk_get_prev_ncnlnp(prev);
+            prev = chunk_get_prev_ncnnlnp(prev);
             continue;
          }
 
@@ -2008,7 +1593,7 @@ void mark_function(chunk_t *pc)
             while (  chunk_is_token(prev, CT_DC_MEMBER)
                   || chunk_is_token(prev, CT_MEMBER))
             {
-               prev = chunk_get_prev_ncnlnp(prev);
+               prev = chunk_get_prev_ncnnlnp(prev);
 
                if (  prev == nullptr
                   || (  chunk_is_not_token(prev, CT_WORD)
@@ -2026,7 +1611,7 @@ void mark_function(chunk_t *pc)
                // clarification: this will skip the CT_WORD, CT_TYPE or CT_THIS landing on either
                // another CT_DC_MEMBER or CT_MEMBER or a token that indicates the context of the
                // token in question; therefore, exit loop when not a CT_DC_MEMBER or CT_MEMBER
-               prev = chunk_get_prev_ncnlnp(prev);
+               prev = chunk_get_prev_ncnnlnp(prev);
 
                if (prev == nullptr)
                {
@@ -2057,7 +1642,7 @@ void mark_function(chunk_t *pc)
                isa_def = true;
                break;
             }
-            chunk_t *prev_prev = chunk_get_prev_ncnlnp(prev);
+            chunk_t *prev_prev = chunk_get_prev_ncnnlnp(prev);
 
             if (!chunk_is_token(prev_prev, CT_QUESTION))               // Issue #1753
             {
@@ -2112,7 +1697,7 @@ void mark_function(chunk_t *pc)
          }
          else
          {
-            prev = chunk_get_prev_ncnlnp(prev);
+            prev = chunk_get_prev_ncnnlnp(prev);
          }
       }
       //LOG_FMT(LFCN, " -- stopped on %s [%s]\n",
@@ -2121,25 +1706,25 @@ void mark_function(chunk_t *pc)
       // Fixes issue #1634
       if (chunk_is_paren_close(prev))
       {
-         chunk_t *preproc = chunk_get_next_ncnl(prev);
+         chunk_t *preproc = chunk_get_next_ncnnl(prev);
 
          if (chunk_is_token(preproc, CT_PREPROC))
          {
             size_t pp_level = preproc->pp_level;
 
-            if (chunk_is_token(chunk_get_next_ncnl(preproc), CT_PP_ELSE))
+            if (chunk_is_token(chunk_get_next_ncnnl(preproc), CT_PP_ELSE))
             {
                do
                {
-                  preproc = chunk_get_prev_ncnlni(preproc);      // Issue #2279
+                  preproc = chunk_get_prev_ncnnlni(preproc);      // Issue #2279
 
                   if (chunk_is_token(preproc, CT_PP_IF))
                   {
-                     preproc = chunk_get_prev_ncnlni(preproc);   // Issue #2279
+                     preproc = chunk_get_prev_ncnnlni(preproc);   // Issue #2279
 
                      if (preproc->pp_level == pp_level)
                      {
-                        prev = chunk_get_prev_ncnlnp(preproc);
+                        prev = chunk_get_prev_ncnnlnp(preproc);
                         break;
                      }
                   }
@@ -2165,7 +1750,7 @@ void mark_function(chunk_t *pc)
       // Fixes issue #1266, identification of a tuple return type in CS.
       if (  !isa_def
          && chunk_is_token(prev, CT_PAREN_CLOSE)
-         && chunk_get_next_ncnl(prev) == pc)
+         && chunk_get_next_ncnnl(prev) == pc)
       {
          tmp = chunk_skip_to_match_rev(prev);
 
@@ -2180,7 +1765,7 @@ void mark_function(chunk_t *pc)
                isa_def = true;
                break;
             }
-            tmp = chunk_get_next_ncnl(tmp);
+            tmp = chunk_get_next_ncnnl(tmp);
          }
       }
 
@@ -2198,7 +1783,7 @@ void mark_function(chunk_t *pc)
          }
 
          for (  tmp = prev; (tmp != nullptr)
-             && tmp != pc; tmp = chunk_get_next_ncnlnp(tmp))
+             && tmp != pc; tmp = chunk_get_next_ncnnlnp(tmp))
          {
             LOG_FMT(LFCN, "%s(%d): text() is '%s', type is %s\n",
                     __func__, __LINE__, tmp->text(), get_token_name(tmp->type));
@@ -2235,7 +1820,7 @@ void mark_function(chunk_t *pc)
    // Scan tokens until we hit a brace open (def) or semicolon (proto)
    tmp = paren_close;
 
-   while ((tmp = chunk_get_next_ncnl(tmp)) != nullptr)
+   while ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
    {
       // Only care about brace or semicolon on the same level
       if (tmp->level < pc->level)
@@ -2302,9 +1887,10 @@ void mark_function(chunk_t *pc)
       while (  tmp != nullptr
             && !tmp->flags.test(PCF_STMT_START))
       {
-         tmp = chunk_get_prev_ncnlni(tmp);   // Issue #2279
+         tmp = chunk_get_prev_ncnnlni(tmp);   // Issue #2279
       }
-      const bool is_extern = (tmp && tmp->str.equals("extern"));
+      const bool is_extern = (  tmp != nullptr
+                             && tmp->str.equals("extern"));
 
       /*
        * Scan the parameters looking for:
@@ -2313,14 +1899,14 @@ void mark_function(chunk_t *pc)
        *  - non-type fields
        *  - function calls
        */
-      chunk_t *ref = chunk_get_next_ncnl(paren_open);
+      chunk_t *ref = chunk_get_next_ncnnl(paren_open);
       chunk_t *tmp2;
       bool    is_param = true;
       tmp = ref;
 
       while (tmp != paren_close)
       {
-         tmp2 = chunk_get_next_ncnl(tmp);
+         tmp2 = chunk_get_next_ncnnl(tmp);
 
          if (  chunk_is_token(tmp, CT_COMMA)
             && (tmp->level == (paren_open->level + 1)))
@@ -2336,7 +1922,8 @@ void mark_function(chunk_t *pc)
       }
 
       if (  !is_extern
-         && is_param && ref != tmp)
+         && is_param
+         && ref != tmp)
       {
          if (!can_be_full_param(ref, tmp))
          {
@@ -2360,7 +1947,7 @@ void mark_function(chunk_t *pc)
             && get_chunk_parent_type(br_open) != CT_NAMESPACE)
          {
             // Do a check to see if the level is right
-            prev = chunk_get_prev_ncnlni(pc);   // Issue #2279
+            prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
 
             if (  !chunk_is_str(prev, "*", 1)
                && !chunk_is_str(prev, "&", 1))
@@ -2405,7 +1992,7 @@ void mark_function(chunk_t *pc)
 
    if (chunk_is_token(next, CT_TSQUARE))
    {
-      next = chunk_get_next_ncnl(next);
+      next = chunk_get_next_ncnnl(next);
 
       if (next == nullptr)
       {
@@ -2414,14 +2001,14 @@ void mark_function(chunk_t *pc)
    }
    // Mark parameters and return type
    fix_fcn_def_params(next);
-   mark_function_return_type(pc, chunk_get_prev_ncnlni(pc), pc->type);   // Issue #2279
+   mark_function_return_type(pc, chunk_get_prev_ncnnlni(pc), pc->type);   // Issue #2279
 
    /* mark C# where chunk */
    if (  language_is_set(LANG_CS)
       && (  (chunk_is_token(pc, CT_FUNC_DEF))
          || (chunk_is_token(pc, CT_FUNC_PROTO))))
    {
-      tmp = chunk_get_next_ncnl(paren_close);
+      tmp = chunk_get_next_ncnnl(paren_close);
       pcf_flags_t in_where_spec_flags = PCF_NONE;
 
       while (  tmp != nullptr
@@ -2431,14 +2018,14 @@ void mark_function(chunk_t *pc)
          mark_where_chunk(tmp, pc->type, tmp->flags | in_where_spec_flags);
          in_where_spec_flags = tmp->flags & PCF_IN_WHERE_SPEC;
 
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
    }
 
    // Find the brace pair and set the parent
    if (chunk_is_token(pc, CT_FUNC_DEF))
    {
-      tmp = chunk_get_next_ncnl(paren_close);
+      tmp = chunk_get_next_ncnnl(paren_close);
 
       while (  tmp != nullptr
             && chunk_is_not_token(tmp, CT_BRACE_OPEN))
@@ -2451,7 +2038,7 @@ void mark_function(chunk_t *pc)
          {
             chunk_flags_set(tmp, PCF_OLD_FCN_PARAMS);
          }
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
 
       if (chunk_is_token(tmp, CT_BRACE_OPEN))
@@ -2490,15 +2077,16 @@ bool mark_function_type(chunk_t *pc)
    c_token_t pt, ptp;
 
    // Scan backwards across the name, which can only be a word and single star
-   chunk_t *varcnk = chunk_get_prev_ncnlni(pc);   // Issue #2279
+   chunk_t *varcnk = chunk_get_prev_ncnnlni(pc);   // Issue #2279
 
    varcnk = chunk_get_prev_ssq(varcnk);
 
-   if (varcnk != nullptr && !chunk_is_word(varcnk))
+   if (  varcnk != nullptr
+      && !chunk_is_word(varcnk))
    {
       if (  language_is_set(LANG_OC)
          && chunk_is_str(varcnk, "^", 1)
-         && chunk_is_paren_open(chunk_get_prev_ncnlni(varcnk)))   // Issue #2279
+         && chunk_is_paren_open(chunk_get_prev_ncnnlni(varcnk)))   // Issue #2279
       {
          // anonymous ObjC block type -- RTYPE (^)(ARGS)
          anon = true;
@@ -2511,7 +2099,7 @@ bool mark_function_type(chunk_t *pc)
          goto nogo_exit;
       }
    }
-   apo = chunk_get_next_ncnl(pc);
+   apo = chunk_get_next_ncnnl(pc);
 
    if (apo == nullptr)
    {
@@ -2526,7 +2114,7 @@ bool mark_function_type(chunk_t *pc)
       LOG_FMT(LFTYPE, "%s(%d): not followed by parens\n", __func__, __LINE__);
       goto nogo_exit;
    }
-   aft = chunk_get_next_ncnl(apc);
+   aft = chunk_get_next_ncnnl(apc);
 
    if (chunk_is_token(aft, CT_BRACE_OPEN))
    {
@@ -2546,7 +2134,7 @@ bool mark_function_type(chunk_t *pc)
 
    tmp = pc;
 
-   while ((tmp = chunk_get_prev_ncnlni(tmp)) != nullptr)   // Issue #2279
+   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
    {
       tmp = chunk_get_prev_ssq(tmp);
 
@@ -2592,7 +2180,9 @@ bool mark_function_type(chunk_t *pc)
    // Allow word count 2 incase of function pointer declaration.
    // Ex: bool (__stdcall* funcptr)(int, int);
    if (  star_count > 1
-      || (word_count > 1 && !(word_count == 2 && ptp == CT_FUNC_VAR))
+      || (  word_count > 1
+         && !(  word_count == 2
+             && ptp == CT_FUNC_VAR))
       || ((star_count + word_count) == 0))
    {
       LOG_FMT(LFTYPE, "%s(%d): bad counts word: %zu, star: %zu\n",
@@ -2601,7 +2191,7 @@ bool mark_function_type(chunk_t *pc)
    }
 
    // make sure what appears before the first open paren can be a return type
-   if (!chunk_ends_type(chunk_get_prev_ncnlni(tmp)))   // Issue #2279
+   if (!chunk_ends_type(chunk_get_prev_ncnnlni(tmp)))   // Issue #2279
    {
       goto nogo_exit;
    }
@@ -2643,7 +2233,7 @@ bool mark_function_type(chunk_t *pc)
    // Step backwards to the previous open paren and mark everything a
    tmp = pc;
 
-   while ((tmp = chunk_get_prev_ncnlni(tmp)) != nullptr)   // Issue #2279
+   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
    {
       LOG_FMT(LFTYPE, " ++ type is %s, text() '%s', on orig_line %zu, orig_col %zu\n",
               get_token_name(tmp->type), tmp->text(),
@@ -2658,7 +2248,7 @@ bool mark_function_type(chunk_t *pc)
          set_chunk_type(tmp, CT_TPAREN_OPEN);
          set_chunk_parent(tmp, ptp);
 
-         tmp = chunk_get_prev_ncnlni(tmp);   // Issue #2279
+         tmp = chunk_get_prev_ncnnlni(tmp);   // Issue #2279
 
          if (  chunk_is_token(tmp, CT_FUNCTION)
             || chunk_is_token(tmp, CT_FUNC_CALL)
@@ -2676,7 +2266,7 @@ bool mark_function_type(chunk_t *pc)
    return(true);
 
 nogo_exit:
-   tmp = chunk_get_next_ncnl(pc);
+   tmp = chunk_get_next_ncnnl(pc);
 
    if (chunk_is_paren_open(tmp))
    {
@@ -2698,25 +2288,30 @@ void mark_lvalue(chunk_t *pc)
       return;
    }
 
-   for (prev = chunk_get_prev_ncnlni(pc);     // Issue #2279
+   for (prev = chunk_get_prev_ncnnlni(pc);     // Issue #2279
         prev != nullptr;
-        prev = chunk_get_prev_ncnlni(prev))   // Issue #2279
+        prev = chunk_get_prev_ncnnlni(prev))   // Issue #2279
    {
       if (  prev->level < pc->level
+         || chunk_is_token(prev, CT_ACCESS_COLON)
          || chunk_is_token(prev, CT_ASSIGN)
-         || chunk_is_token(prev, CT_COMMA)
          || chunk_is_token(prev, CT_BOOL)
+         || chunk_is_token(prev, CT_COMMA)
+         || chunk_is_cpp_inheritance_access_specifier(prev)
          || chunk_is_semicolon(prev)
          || chunk_is_str(prev, "(", 1)
          || chunk_is_str(prev, "{", 1)
          || chunk_is_str(prev, "[", 1)
-         || prev->flags.test(PCF_IN_PREPROC))
+         || prev->flags.test(PCF_IN_PREPROC)
+         || get_chunk_parent_type(prev) == CT_NAMESPACE
+         || get_chunk_parent_type(prev) == CT_TEMPLATE)
       {
          break;
       }
       chunk_flags_set(prev, PCF_LVALUE);
 
-      if (prev->level == pc->level && chunk_is_str(prev, "&", 1))
+      if (  prev->level == pc->level
+         && chunk_is_str(prev, "&", 1))
       {
          make_type(prev);
       }
@@ -2738,7 +2333,7 @@ void mark_struct_union_body(chunk_t *start)
          || chunk_is_token(pc, CT_BRACE_CLOSE)
          || chunk_is_token(pc, CT_SEMICOLON))
       {
-         pc = chunk_get_next_ncnl(pc);
+         pc = chunk_get_next_ncnnl(pc);
 
          if (pc == nullptr)
          {
@@ -2774,7 +2369,7 @@ void mark_template_func(chunk_t *pc, chunk_t *pc_next)
 
    // We know angle_close must be there...
    chunk_t *angle_close = chunk_get_next_type(pc_next, CT_ANGLE_CLOSE, pc->level);
-   chunk_t *after       = chunk_get_next_ncnl(angle_close);
+   chunk_t *after       = chunk_get_next_ncnnl(angle_close);
 
    if (after != nullptr)
    {
@@ -2853,8 +2448,8 @@ chunk_t *mark_variable_definition(chunk_t *start)
                  __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
 
          LOG_FMT(LVARDEF,
-                 "%s(%d): orig_line is %zu, marked text() '%s'[%s] "
-                 "in orig_col %zu, flags: %s -> %s\n",
+                 "%s(%d): orig_line is %zu, marked text() '%s'[%s]\n"
+                 "   in orig_col %zu, flags: %s -> %s\n",
                  __func__, __LINE__, pc->orig_line, pc->text(),
                  get_token_name(pc->type), pc->orig_col,
                  pcf_flags_str(orig_flags).c_str(),
@@ -2880,7 +2475,7 @@ chunk_t *mark_variable_definition(chunk_t *start)
       {
          bit_field_colon_is_present = true;                    // Issue #2689
       }
-      pc = chunk_get_next_ncnl(pc);
+      pc = chunk_get_next_ncnnl(pc);
    }
    return(pc);
 } // mark_variable_definition
@@ -2963,7 +2558,8 @@ pcf_flags_t mark_where_chunk(chunk_t *pc, c_token_t parent_type, pcf_flags_t fla
          LOG_FMT(LFTOR, "%s: where-spec colon on line %zu\n",
                  __func__, pc->orig_line);
       }
-      else if ((chunk_is_token(pc, CT_STRUCT)) || (chunk_is_token(pc, CT_CLASS)))
+      else if (  (chunk_is_token(pc, CT_STRUCT))
+              || (chunk_is_token(pc, CT_CLASS)))
       {
          /* class/struct inside of a where-clause confuses parser for indentation; set it as a word so it looks like the rest */
          set_chunk_type(pc, CT_WORD);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_fix_mark.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.h
index 75970cad..c0e724dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_fix_mark.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_fix_mark.h
@@ -23,22 +23,6 @@ void fix_casts(chunk_t *start);
 
 
 /**
- * We are on an enum/struct/union tag that is NOT inside a typedef.
- * If there is a {...} and words before the ';', then they are variables.
- *
- * tag { ... } [*] word [, [*]word] ;
- * tag [word/type] { ... } [*] word [, [*]word] ;
- * enum [word/type [: int_type]] { ... } [*] word [, [*]word] ;
- * tag [word/type] [word]; -- this gets caught later.
- * fcn(tag [word/type] [word])
- * a = (tag [word/type] [*])&b;
- *
- * REVISIT: should this be consolidated with the typedef code?
- */
-void fix_enum_struct_union(chunk_t *pc);
-
-
-/**
  * Simply change any STAR to PTR_TYPE and WORD to TYPE
  *
  * @param start  points to the open paren
@@ -81,14 +65,19 @@ void fix_typedef(chunk_t *start);
 chunk_t *fix_variable_definition(chunk_t *start);
 
 
-/**
- * We're on a 'class' or 'struct'.
- * Scan for CT_FUNCTION with a string that matches pclass->str
- */
-void mark_class_ctor(chunk_t *start);
+void mark_cpp_constructor(chunk_t *pc);
 
 
-void mark_cpp_constructor(chunk_t *pc);
+/**
+ * Mark all chunks belonging to a C++ lambda expression
+ *
+ * @param square_open points to a chunk of type CT_SQUARE_OPEN, and the parent type is
+ *                    assumed to have already been assigned the value CT_CPP_LAMBDA;
+ *                    under this assumption, the function marks all chunks as PCF_IN_LAMBDA
+ *                    until the corresponding closing CT_BRACE_CLOSE (with parent type
+ *                    CT_CPP_LAMBDA) is encountered
+ */
+void mark_cpp_lambda(chunk_t *square_open);
 
 
 /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_labels.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.cpp
index b5b19220..9abebc4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_labels.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.cpp
@@ -105,16 +105,19 @@ void combine_labels(void)
          hit_class = true;
       }
 
-      if (chunk_is_semicolon(next) || chunk_is_token(next, CT_BRACE_OPEN))
+      if (  chunk_is_semicolon(next)
+         || chunk_is_token(next, CT_BRACE_OPEN))
       {
          hit_class = false;
       }
 
-      if (chunk_is_token(prev, CT_SQUARE_OPEN) && get_chunk_parent_type(prev) == CT_OC_MSG)
+      if (  chunk_is_token(prev, CT_SQUARE_OPEN)
+         && get_chunk_parent_type(prev) == CT_OC_MSG)
       {
          cs.Push_Back(prev);
       }
-      else if (chunk_is_token(next, CT_SQUARE_CLOSE) && get_chunk_parent_type(next) == CT_OC_MSG)
+      else if (  chunk_is_token(next, CT_SQUARE_CLOSE)
+              && get_chunk_parent_type(next) == CT_OC_MSG)
       {
          // pop until we hit '['
          while (!cs.Empty())
@@ -129,7 +132,8 @@ void combine_labels(void)
          }
       }
 
-      if (chunk_is_token(next, CT_QUESTION) && !next->flags.test(PCF_IN_TEMPLATE))
+      if (  chunk_is_token(next, CT_QUESTION)
+         && !next->flags.test(PCF_IN_TEMPLATE))
       {
          cs.Push_Back(next);
       }
@@ -164,7 +168,7 @@ void combine_labels(void)
          {
             hit_case = false;
             set_chunk_type(next, CT_CASE_COLON);
-            chunk_t *tmp = chunk_get_next_ncnlnp(next);                // Issue #2150
+            chunk_t *tmp = chunk_get_next_ncnnlnp(next);                // Issue #2150
 
             if (chunk_is_token(tmp, CT_BRACE_OPEN))
             {
@@ -177,9 +181,10 @@ void combine_labels(void)
                }
             }
 
-            if (chunk_is_token(cur, CT_NUMBER) && chunk_is_token(prev, CT_ELLIPSIS))
+            if (  chunk_is_token(cur, CT_NUMBER)
+               && chunk_is_token(prev, CT_ELLIPSIS))
             {
-               chunk_t *pre_elipsis = chunk_get_prev_ncnlnp(prev);
+               chunk_t *pre_elipsis = chunk_get_prev_ncnnlnp(prev);
 
                if (chunk_is_token(pre_elipsis, CT_NUMBER))
                {
@@ -208,7 +213,8 @@ void combine_labels(void)
 
             if (language_is_set(LANG_PAWN))
             {
-               if (chunk_is_token(cur, CT_WORD) || chunk_is_token(cur, CT_BRACE_CLOSE))
+               if (  chunk_is_token(cur, CT_WORD)
+                  || chunk_is_token(cur, CT_BRACE_CLOSE))
                {
                   c_token_t new_type = CT_TAG;
 
@@ -219,7 +225,8 @@ void combine_labels(void)
                      return;
                   }
 
-                  if (chunk_is_newline(prev) && chunk_is_newline(tmp))
+                  if (  chunk_is_newline(prev)
+                     && chunk_is_newline(tmp))
                   {
                      new_type = CT_LABEL;
                      set_chunk_type(next, CT_LABEL_COLON);
@@ -288,7 +295,7 @@ void combine_labels(void)
 
                      if (chunk_is_token(labelPrev, CT_NEWLINE))
                      {
-                        labelPrev = chunk_get_prev_ncnlni(prev);   // Issue #2279
+                        labelPrev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
                      }
 
                      if (  labelPrev != nullptr
@@ -370,7 +377,8 @@ void combine_labels(void)
             {
                // ignore it - bit field, align or public/private, etc
             }
-            else if (chunk_is_token(cur, CT_ANGLE_CLOSE) || hit_class)
+            else if (  chunk_is_token(cur, CT_ANGLE_CLOSE)
+                    || hit_class)
             {
                // ignore it - template thingy
             }
@@ -388,7 +396,7 @@ void combine_labels(void)
             }
             else
             {
-               chunk_t *tmp = chunk_get_next_ncnl(next);
+               chunk_t *tmp = chunk_get_next_ncnnl(next);
 
                //tmp = chunk_get_next_local(next);
                if (tmp != nullptr)
@@ -398,7 +406,8 @@ void combine_labels(void)
                           __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col,
                           get_token_name(tmp->type));
 
-                  if (chunk_is_token(tmp, CT_BASE) || chunk_is_token(tmp, CT_THIS))
+                  if (  chunk_is_token(tmp, CT_BASE)
+                     || chunk_is_token(tmp, CT_THIS))
                   {
                      // ignore it, as it is a C# base thingy
                   }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_labels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.h
index 4a273d0b..4a273d0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_labels.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_labels.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.cpp
new file mode 100644
index 00000000..25194498
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.cpp
@@ -0,0 +1,324 @@
+/**
+ * @file combine_skip.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ * extract from combine.cpp
+ */
+
+#include "combine_skip.h"
+
+#include "combine_tools.h"
+
+
+chunk_t *skip_align(chunk_t *start)
+{
+   chunk_t *pc = start;
+
+   if (chunk_is_token(pc, CT_ALIGN))
+   {
+      pc = chunk_get_next_ncnnl(pc);
+
+      if (chunk_is_token(pc, CT_PAREN_OPEN))
+      {
+         pc = chunk_get_next_type(pc, CT_PAREN_CLOSE, pc->level);
+         pc = chunk_get_next_ncnnl(pc);
+
+         if (chunk_is_token(pc, CT_COLON))
+         {
+            pc = chunk_get_next_ncnnl(pc);
+         }
+      }
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_expression(chunk_t *pc)
+{
+   return(chunk_get_next_ncnnl(skip_to_expression_end(pc)));
+}
+
+
+chunk_t *skip_expression_rev(chunk_t *pc)
+{
+   return(chunk_get_prev_ncnnlni(skip_to_expression_start(pc)));
+}
+
+
+static chunk_t *skip_to_expression_edge(chunk_t *pc, chunk_t *(*chunk_get_next)(chunk_t *cur, scope_e scope))
+{
+   chunk_t *prev = pc;
+
+   if (  prev != nullptr
+      && chunk_get_next != nullptr)
+   {
+      std::size_t level         = prev->level;
+      chunk_t     *next         = prev;
+      std::size_t template_nest = get_cpp_template_angle_nest_level(prev);
+
+      while (  next != nullptr
+            && next->level >= level)
+      {
+         /**
+          * if we encounter a comma or semicolon at the level of the starting chunk,
+          * return the current chunk
+          */
+         if (  next->level == level
+            && (  chunk_is_token(next, CT_COMMA)
+               || chunk_is_semicolon(next)))
+         {
+            break;
+         }
+         /**
+          * check the template nest level; if the current chunk's nest level
+          * is less than that of the starting chunk, return the current chunk
+          */
+         auto next_template_nest = get_cpp_template_angle_nest_level(next);
+
+         if (template_nest > next_template_nest)
+         {
+            break;
+         }
+         prev = next;
+         next = (*chunk_get_next)(next, scope_e::PREPROC);
+      }
+   }
+   return(prev);
+}
+
+
+chunk_t *skip_to_expression_end(chunk_t *pc)
+{
+   return(skip_to_expression_edge(pc, chunk_get_next_ncnnl));
+}
+
+
+chunk_t *skip_to_expression_start(chunk_t *pc)
+{
+   return(skip_to_expression_edge(pc, chunk_get_prev_ncnnlni));
+}
+
+
+chunk_t *skip_to_next_statement(chunk_t *pc)
+{
+   while (  pc != nullptr
+         && !chunk_is_semicolon(pc)
+         && chunk_is_not_token(pc, CT_BRACE_OPEN)
+         && chunk_is_not_token(pc, CT_BRACE_CLOSE))
+   {
+      pc = chunk_get_next_ncnnl(pc);
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_parent_types(chunk_t *colon)
+{
+   auto pc = chunk_get_next_ncnnlnp(colon);
+
+   while (pc)
+   {
+      // Skip access specifier
+      if (chunk_is_token(pc, CT_ACCESS))
+      {
+         pc = chunk_get_next_ncnnlnp(pc);
+         continue;
+      }
+
+      // Check for a type name
+      if (!(  chunk_is_token(pc, CT_WORD)
+           || chunk_is_token(pc, CT_TYPE)))
+      {
+         LOG_FMT(LPCU,
+                 "%s is confused; expected a word at %zu:%zu "
+                 "following type list at %zu:%zu\n", __func__,
+                 colon->orig_line, colon->orig_col,
+                 pc->orig_line, pc->orig_col);
+         return(colon);
+      }
+      // Get next token
+      auto next = skip_template_next(chunk_get_next_ncnnlnp(pc));
+
+      if (  chunk_is_token(next, CT_DC_MEMBER)
+         || chunk_is_token(next, CT_COMMA))
+      {
+         pc = chunk_get_next_ncnnlnp(next);
+      }
+      else if (next)
+      {
+         LOG_FMT(LPCU, "%s -> %zu:%zu ('%s')\n", __func__,
+                 next->orig_line, next->orig_col, next->text());
+         return(next);
+      }
+      else
+      {
+         break;
+      }
+   }
+   LOG_FMT(LPCU, "%s: did not find end of type list (start was %zu:%zu)\n",
+           __func__, colon->orig_line, colon->orig_col);
+   return(colon);
+} // skip_parent_types
+
+
+chunk_t *skip_template_prev(chunk_t *ang_close)
+{
+   if (chunk_is_token(ang_close, CT_ANGLE_CLOSE))
+   {
+      chunk_t *pc = chunk_get_prev_type(ang_close, CT_ANGLE_OPEN, ang_close->level);
+      return(chunk_get_prev_ncnnlni(pc));   // Issue #2279
+   }
+   return(ang_close);
+}
+
+
+chunk_t *skip_tsquare_next(chunk_t *ary_def)
+{
+   if (  chunk_is_token(ary_def, CT_SQUARE_OPEN)
+      || chunk_is_token(ary_def, CT_TSQUARE))
+   {
+      return(chunk_get_next_nisq(ary_def));
+   }
+   return(ary_def);
+}
+
+
+chunk_t *skip_attribute(chunk_t *attr)
+{
+   chunk_t *pc = attr;
+
+   while (chunk_is_token(pc, CT_ATTRIBUTE))
+   {
+      pc = chunk_get_next_ncnnl(pc);
+
+      if (chunk_is_token(pc, CT_FPAREN_OPEN))
+      {
+         pc = chunk_get_next_type(pc, CT_FPAREN_CLOSE, pc->level);
+      }
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_attribute_next(chunk_t *attr)
+{
+   chunk_t *next = skip_attribute(attr);
+
+   if (  next != attr
+      && chunk_is_token(next, CT_FPAREN_CLOSE))
+   {
+      attr = chunk_get_next_ncnnl(next);
+   }
+   return(attr);
+}
+
+
+chunk_t *skip_attribute_prev(chunk_t *fp_close)
+{
+   chunk_t *pc = fp_close;
+
+   while (true)
+   {
+      if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
+         && get_chunk_parent_type(pc) == CT_ATTRIBUTE)
+      {
+         pc = chunk_get_prev_type(pc, CT_ATTRIBUTE, pc->level);
+      }
+      else if (chunk_is_not_token(pc, CT_ATTRIBUTE))
+      {
+         break;
+      }
+      pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_declspec(chunk_t *pc)
+{
+   if (chunk_is_token(pc, CT_DECLSPEC))
+   {
+      pc = chunk_get_next_ncnnl(pc);
+
+      if (chunk_is_token(pc, CT_PAREN_OPEN))
+      {
+         pc = chunk_skip_to_match(pc);
+      }
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_declspec_next(chunk_t *pc)
+{
+   chunk_t *next = skip_declspec(pc);
+
+   if (  next != pc
+      && chunk_is_token(next, CT_PAREN_CLOSE))
+   {
+      pc = chunk_get_next_ncnnl(next);
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_declspec_prev(chunk_t *pc)
+{
+   if (  chunk_is_token(pc, CT_PAREN_CLOSE)
+      && get_chunk_parent_type(pc) == CT_DECLSPEC)
+   {
+      pc = chunk_skip_to_match_rev(pc);
+      pc = chunk_get_prev_ncnnlni(pc);
+
+      if (chunk_is_token(pc, CT_DECLSPEC))
+      {
+         pc = chunk_get_prev_ncnnlni(pc);
+      }
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *pc)
+{
+   if (  chunk_is_token(pc, CT_BRACE_OPEN)
+      || chunk_is_token(pc, CT_PAREN_OPEN)
+      || chunk_is_token(pc, CT_SQUARE_OPEN))
+   {
+      pc = chunk_skip_to_match(pc);
+
+      if (pc != nullptr)
+      {
+         /**
+          * a matching brace, square bracket, or paren was found;
+          * retrieve the subsequent chunk
+          */
+
+         pc = chunk_get_next_ncnnl(pc);
+      }
+   }
+   return(pc);
+}
+
+
+chunk_t *skip_to_chunk_before_matching_brace_bracket_paren_rev(chunk_t *pc)
+{
+   if (  chunk_is_token(pc, CT_BRACE_CLOSE)
+      || chunk_is_token(pc, CT_PAREN_CLOSE)
+      || chunk_is_token(pc, CT_SQUARE_CLOSE))
+   {
+      pc = chunk_skip_to_match_rev(pc);
+
+      if (pc != nullptr)
+      {
+         /**
+          * a matching brace, square bracket, or paren was found;
+          * retrieve the preceding chunk
+          */
+
+         pc = chunk_get_prev_ncnnlni(pc);
+      }
+   }
+   return(pc);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.h
new file mode 100644
index 00000000..d31d1792
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_skip.h
@@ -0,0 +1,169 @@
+/**
+ * @file combine_skip.h
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ * extract from combine.cpp
+ */
+
+#ifndef COMBINE_SKIP_H_INCLUDED
+#define COMBINE_SKIP_H_INCLUDED
+
+#include "chunk_list.h"
+
+
+/**
+ * Skips the D 'align()' statement and the colon, if present.
+ *    align(2) int foo;  -- returns 'int'
+ *    align(4):          -- returns 'int'
+ *    int bar;
+ */
+chunk_t *skip_align(chunk_t *start);
+
+
+/**
+ * Skips chunks in the forward direction and attempts to find the
+ * chunk associated with the end of the current expression; returns
+ * the first chunk to satisfy one of the following:
+ * 1) Chunk is a comma or semicolon at the level of the starting chunk
+ * 2) Preceding chunk is at higher template nest level relative to the
+ *    current chunk under test
+ */
+chunk_t *skip_expression(chunk_t *pc);
+
+
+/**
+ * Skips chunks in the reverse direction and attempts to find the
+ * chunk associated with the start of the current expression; returns
+ * the first chunk to satisfy one of the following:
+ * 1) Chunk is a comma or semicolon at the level of the starting chunk
+ * 2) Preceding chunk is at lower template nest level relative to the
+ *    current chunk under test
+ */
+chunk_t *skip_expression_rev(chunk_t *pc);
+
+
+/**
+ * Skips chunks in the forward direction and attempts to find the
+ * chunk associated with the end of the current expression; specifically,
+ * the function returns that which immediately precedes a chunk
+ * satisfying one of the following:
+ * 1) Next chunk is a comma or semicolon at the level of the starting chunk
+ * 2) Preceding chunk is at a higher template nest level relative to the
+ *    subsequent chunk
+ */
+chunk_t *skip_to_expression_end(chunk_t *pc);
+
+
+/**
+ * Skips chunks in the reverse direction and attempts to find the chunk
+ * associated with the start of the current expression; specifically,
+ * the function returns that which immediately follows a chunk
+ * satisfying one of the following:
+ * 1) Prior chunk is a comma or semicolon at the level of the starting chunk
+ * 2) Preceding chunk is at a lower template nest level relative to the
+ *    subsequent chunk
+ */
+chunk_t *skip_to_expression_start(chunk_t *pc);
+
+
+/**
+ * Skips the list of class/struct parent types.
+ */
+chunk_t *skip_parent_types(chunk_t *colon);
+
+
+/**
+ * Skips over the rest of the template if ang_open is indeed a CT_ANGLE_OPEN.
+ * Points to the chunk after the CT_ANGLE_CLOSE.
+ * If the chunk isn't an CT_ANGLE_OPEN, then it is returned.
+ */
+chunk_t *skip_template_next(chunk_t *ang_open);
+
+
+/**
+ * Skips over the rest of the template if ang_close is indeed a CT_ANGLE_CLOSE.
+ * Points to the chunk before the CT_ANGLE_OPEN
+ * If the chunk isn't an CT_ANGLE_CLOSE, then it is returned.
+ */
+chunk_t *skip_template_prev(chunk_t *ang_close);
+
+
+//! Skips to the start of the next statement.
+chunk_t *skip_to_next_statement(chunk_t *pc);
+
+
+/**
+ * Skips the rest of the array definitions if ary_def is indeed a
+ * CT_TSQUARE or CT_SQUARE_OPEN
+ */
+chunk_t *skip_tsquare_next(chunk_t *ary_def);
+
+
+/**
+ * If pc is CT_ATTRIBUTE, then skip it and everything preceding the closing
+ * paren; return the chunk marked CT_FPAREN_CLOSE
+ * If the chunk isn't a CT_ATTRIBUTE, then it is returned.
+ */
+chunk_t *skip_attribute(chunk_t *attr);
+
+
+/**
+ * If attr is CT_ATTRIBUTE, then skip it and the parens and return the chunk
+ * after the CT_FPAREN_CLOSE.
+ * If the chunk isn't an CT_ATTRIBUTE, then it is returned.
+ */
+chunk_t *skip_attribute_next(chunk_t *attr);
+
+
+/**
+ * If fp_close is a CT_FPAREN_CLOSE with a parent of CT_ATTRIBUTE, then skip it
+ * and the '__attribute__' thingy and return the chunk before CT_ATTRIBUTE.
+ * Otherwise return fp_close.
+ */
+chunk_t *skip_attribute_prev(chunk_t *fp_close);
+
+
+/**
+ * If pc is CT_DECLSPEC, then skip it and everything preceding the closing
+ * paren; return the chunk marked CT_FPAREN_CLOSE
+ * If the chunk isn't a CT_DECLSPEC, then it is returned.
+ */
+chunk_t *skip_declspec(chunk_t *pc);
+
+
+/**
+ * If pc is CT_DECLSPEC, then skip it and the parens and return the chunk
+ * after the CT_FPAREN_CLOSE.
+ * If the chunk isn't a CT_DECLSPEC, then it is returned.
+ */
+chunk_t *skip_declspec_next(chunk_t *pc);
+
+
+/**
+ * If pc is a CT_FPAREN_CLOSE with a parent of CT_DECLSPEC, then skip it
+ * and the '__declspec' keyword and return the chunk before CT_DECLSPEC.
+ * Otherwise return pc.
+ */
+chunk_t *skip_declspec_prev(chunk_t *pc);
+
+
+/**
+ * If pc is a CT_BRACE_OPEN, CT_PAREN_OPEN or CT_SQUARE_OPEN, then skip
+ * forward to the next non-comment/non-newline chunk following the matching
+ * CT_BRACE_CLOSE, CT_PAREN_CLOSE or CT_SQUARE_CLOSE; if pc is none of these
+ * upon calling this function, then pc is returned.
+ */
+chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *pc);
+
+
+/**
+ * If pc is a CT_BRACE_CLOSE, CT_PAREN_CLOSE or CT_SQUARE_CLOSE, then skip
+ * in reverse to the first non-comment/non-newline chunk preceding the matching
+ * CT_BRACE_OPEN, CT_PAREN_OPEN or CT_SQUARE_OPEN; if pc is none of these upon
+ * calling this function, then pc is returned.
+ */
+chunk_t *skip_to_chunk_before_matching_brace_bracket_paren_rev(chunk_t *pc);
+
+
+#endif /* COMBINE_SKIP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.cpp
index d79bf91a..18450cd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.cpp
@@ -8,7 +8,6 @@
 
 #include "combine_tools.h"
 
-#include "combine_fix_mark.h"
 #include "unc_ctype.h"
 #include "uncrustify.h"
 
@@ -17,17 +16,23 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LFPARAM, "%s:", __func__);
+   LOG_FMT(LFPARAM, "%s(%d): start->text() is '%s', type is %s\n",
+           __func__, __LINE__, start->text(), get_token_name(start->type));
+   LOG_FMT(LFPARAM, "%s(%d): end->text()   is '%s', type is %s\n",
+           __func__, __LINE__, end->text(), get_token_name(end->type));
 
-   int     word_count = 0;
-   int     type_count = 0;
-   chunk_t *pc;
+   int     word_count     = 0;
+   int     type_count     = 0;
+   chunk_t *pc            = nullptr;
+   chunk_t *first_word    = nullptr;
+   bool    first_word_set = false;
 
    for (pc = start;
         pc != nullptr && pc != end;
-        pc = chunk_get_next_ncnl(pc, scope_e::PREPROC))
+        pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
    {
-      LOG_FMT(LFPARAM, " [%s]", pc->text());
+      LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
+              __func__, __LINE__, pc->text(), get_token_name(pc->type));
 
       if (  chunk_is_token(pc, CT_QUALIFIER)
          || chunk_is_token(pc, CT_STRUCT)
@@ -35,27 +40,37 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
          || chunk_is_token(pc, CT_UNION)
          || chunk_is_token(pc, CT_TYPENAME))
       {
-         LOG_FMT(LFPARAM, " <== %s! (yes)\n", get_token_name(pc->type));
+         LOG_FMT(LFPARAM, "%s(%d): <== %s! (yes)\n",
+                 __func__, __LINE__, get_token_name(pc->type));
          return(true);
       }
 
-      if (chunk_is_token(pc, CT_WORD) || chunk_is_token(pc, CT_TYPE))
+      if (  chunk_is_token(pc, CT_WORD)
+         || chunk_is_token(pc, CT_TYPE))
       {
          ++word_count;
 
+         if (!first_word_set)
+         {
+            first_word     = pc;
+            first_word_set = true;
+         }
+
          if (chunk_is_token(pc, CT_TYPE))
          {
             ++type_count;
          }
       }
-      else if (chunk_is_token(pc, CT_MEMBER) || chunk_is_token(pc, CT_DC_MEMBER))
+      else if (  chunk_is_token(pc, CT_MEMBER)
+              || chunk_is_token(pc, CT_DC_MEMBER))
       {
          if (word_count > 0)
          {
             --word_count;
          }
       }
-      else if (pc != start && chunk_is_ptr_operator(pc))
+      else if (  pc != start
+              && chunk_is_ptr_operator(pc))
       {
          // chunk is OK
       }
@@ -66,15 +81,20 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
       }
       else if (chunk_is_token(pc, CT_ANGLE_OPEN))
       {
-         LOG_FMT(LFPARAM, " <== template\n");
+         LOG_FMT(LFPARAM, "%s(%d): <== template\n",
+                 __func__, __LINE__);
+
          return(true);
       }
       else if (chunk_is_token(pc, CT_ELLIPSIS))
       {
-         LOG_FMT(LFPARAM, " <== elipses\n");
+         LOG_FMT(LFPARAM, "%s(%d): <== elipses\n",
+                 __func__, __LINE__);
+
          return(true);
       }
-      else if (word_count == 0 && chunk_is_token(pc, CT_PAREN_OPEN))
+      else if (  word_count == 0
+              && chunk_is_token(pc, CT_PAREN_OPEN))
       {
          // Check for old-school func proto param '(type)'
          chunk_t *tmp1 = chunk_skip_to_match(pc, scope_e::PREPROC);
@@ -83,24 +103,26 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
          {
             return(false);
          }
-         chunk_t *tmp2 = chunk_get_next_ncnl(tmp1, scope_e::PREPROC);
+         chunk_t *tmp2 = chunk_get_next_ncnnl(tmp1, scope_e::PREPROC);
 
          if (tmp2 == nullptr)
          {
             return(false);
          }
 
-         if (chunk_is_token(tmp2, CT_COMMA) || chunk_is_paren_close(tmp2))
+         if (  chunk_is_token(tmp2, CT_COMMA)
+            || chunk_is_paren_close(tmp2))
          {
             do
             {
-               pc = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+               pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
                if (pc == nullptr)
                {
                   return(false);
                }
-               LOG_FMT(LFPARAM, " [%s]", pc->text());
+               LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
+                       __func__, __LINE__, pc->text(), get_token_name(pc->type));
             } while (pc != tmp1);
 
             // reset some vars to allow [] after parens
@@ -109,28 +131,30 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
          }
          else
          {
-            LOG_FMT(LFPARAM, " <== [%s] not fcn type!\n", get_token_name(pc->type));
+            LOG_FMT(LFPARAM, "%s(%d): <== '%s' not fcn type!\n",
+                    __func__, __LINE__, get_token_name(pc->type));
             return(false);
          }
       }
-      else if (  (word_count == 1 || (word_count == type_count))
+      else if (  (  word_count == 1
+                 || (word_count == type_count))
               && chunk_is_token(pc, CT_PAREN_OPEN))
       {
          // Check for func proto param 'void (*name)' or 'void (*name)(params)' or 'void (^name)(params)'
          // <name> can be optional
-         chunk_t *tmp1 = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+         chunk_t *tmp1 = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
          if (tmp1 == nullptr)
          {
             return(false);
          }
-         chunk_t *tmp2 = chunk_get_next_ncnl(tmp1, scope_e::PREPROC);
+         chunk_t *tmp2 = chunk_get_next_ncnnl(tmp1, scope_e::PREPROC);
 
          if (tmp2 == nullptr)
          {
             return(false);
          }
-         chunk_t *tmp3 = (chunk_is_str(tmp2, ")", 1)) ? tmp2 : chunk_get_next_ncnl(tmp2, scope_e::PREPROC);
+         chunk_t *tmp3 = (chunk_is_str(tmp2, ")", 1)) ? tmp2 : chunk_get_next_ncnnl(tmp2, scope_e::PREPROC);
 
          if (tmp3 == nullptr)
          {
@@ -138,14 +162,18 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
          }
 
          if (  !chunk_is_str(tmp3, ")", 1)
-            || !(chunk_is_str(tmp1, "*", 1) || chunk_is_str(tmp1, "^", 1)) // Issue #2656
-            || !(tmp2->type == CT_WORD || chunk_is_str(tmp2, ")", 1)))
+            || !(  chunk_is_str(tmp1, "*", 1)
+                || chunk_is_str(tmp1, "^", 1)) // Issue #2656
+            || !(  tmp2->type == CT_WORD
+                || chunk_is_str(tmp2, ")", 1)))
          {
-            LOG_FMT(LFPARAM, " <== [%s] not fcn type!\n", get_token_name(pc->type));
+            LOG_FMT(LFPARAM, "%s(%d): <== '%s' not fcn type!\n",
+                    __func__, __LINE__, get_token_name(pc->type));
             return(false);
          }
-         LOG_FMT(LFPARAM, " <skip fcn type>");
-         tmp1 = chunk_get_next_ncnl(tmp3, scope_e::PREPROC);
+         LOG_FMT(LFPARAM, "%s(%d): <skip fcn type>\n",
+                 __func__, __LINE__);
+         tmp1 = chunk_get_next_ncnnl(tmp3, scope_e::PREPROC);
 
          if (tmp1 == nullptr)
          {
@@ -157,6 +185,8 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
             tmp3 = chunk_skip_to_match(tmp1, scope_e::PREPROC);
          }
          pc = tmp3;
+         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
+                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
 
          // reset some vars to allow [] after parens
          word_count = 1;
@@ -166,15 +196,21 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
       {
          // ignore it
       }
-      else if (word_count == 1 && chunk_is_token(pc, CT_SQUARE_OPEN))
+      else if (  word_count == 1
+              && chunk_is_token(pc, CT_SQUARE_OPEN))
       {
          // skip over any array stuff
          pc = chunk_skip_to_match(pc, scope_e::PREPROC);
+         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
+                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
       }
-      else if (word_count == 2 && chunk_is_token(pc, CT_SQUARE_OPEN))
+      else if (  word_count == 2
+              && chunk_is_token(pc, CT_SQUARE_OPEN))
       {
          // Bug #671: is it such as: bool foo[FOO_MAX]
          pc = chunk_skip_to_match(pc, scope_e::PREPROC);
+         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
+                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
       }
       else if (  word_count == 1
               && language_is_set(LANG_CPP)
@@ -184,51 +220,90 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
       }
       else
       {
-         LOG_FMT(LFPARAM, " <== [%s] no way! tc=%d wc=%d\n",
-                 get_token_name(pc->type), type_count, word_count);
+         LOG_FMT(LFPARAM, "%s(%d): <== type is %s, no way!, type count is %d, word count is %d\n",
+                 __func__, __LINE__, get_token_name(pc->type), type_count, word_count);
          return(false);
       }
+      LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
+              __func__, __LINE__, pc->text(), get_token_name(pc->type));
    }
 
-   chunk_t *last = chunk_get_prev_ncnlni(pc);   // Issue #2279
+   chunk_t *last = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+
+   LOG_FMT(LFPARAM, "%s(%d): last->text() is '%s', type is %s\n",
+           __func__, __LINE__, last->text(), get_token_name(last->type));
 
    if (chunk_is_ptr_operator(last))
    {
-      LOG_FMT(LFPARAM, " <== [%s] sure!\n", get_token_name(pc->type));
+      LOG_FMT(LFPARAM, "%s(%d): <== type is %s, sure!\n",
+              __func__, __LINE__, get_token_name(last->type));
       return(true);
    }
 
-   if (word_count < 2 && type_count < 1 && start->brace_level > 0)
+   if (  word_count < 2
+      && type_count < 1
+      && start->brace_level > 0)
    {
-      LOG_FMT(LFPARAM, " !MVP!");
+      LOG_FMT(LFPARAM, "%s(%d): !MVP!\n",
+              __func__, __LINE__);
       // Oh, joy, we are in Most Vexing Parse territory
       auto const brace =
          chunk_get_prev_type(start, CT_BRACE_OPEN, start->brace_level - 1);
 
-      if (brace)
+      if (brace != nullptr)
       {
-         LOG_FMT(LFPARAM, " (matching %s brace at %zu:%zu)",
-                 get_token_name(get_chunk_parent_type(brace)),
-                 brace->orig_line, brace->orig_col);
+         LOG_FMT(LFPARAM, "%s(%d): (matching %s brace at orig_line %zu, orig_col is %zu)",
+                 __func__, __LINE__,
+                 get_token_name(get_chunk_parent_type(brace)), brace->orig_line, brace->orig_col);
       }
 
-      if (  brace
+      if (  brace != nullptr
          && (  get_chunk_parent_type(brace) == CT_CLASS
             || get_chunk_parent_type(brace) == CT_STRUCT))
       {
          // A Most Vexing Parse variable declaration cannot occur in the body
          // of a struct/class, so we probably have a function prototype
-         LOG_FMT(LFPARAM, " <== [%s] Likely!\n",
-                 (pc == nullptr ? "nullptr" : get_token_name(pc->type)));
+         LOG_FMT(LFPARAM, "%s(%d): <== type is %s, Likely!\n",
+                 __func__, __LINE__, (pc == nullptr ? "nullptr" : get_token_name(pc->type)));
          return(true);
       }
    }
+   LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', word_count is %d, type_count is %d\n",
+           __func__, __LINE__, pc->text(), word_count, type_count);
+
+   if (first_word != nullptr)
+   {
+      LOG_FMT(LFPARAM, "%s(%d): first_word->text() is '%s'\n",
+              __func__, __LINE__, first_word->text());
+   }
    bool ret = (  word_count >= 2
-              || (word_count == 1 && type_count == 1));
+              || (  word_count == 1
+                 && type_count == 1));
 
-   LOG_FMT(LFPARAM, " <== [%s] %s!\n",
-           (pc == nullptr ? "nullptr" : get_token_name(pc->type)),
-           ret ? "Yup" : "Unlikely");
+   LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', ",
+           __func__, __LINE__, pc->text());
+   LOG_FMT(LFPARAM, "<== type is %s, ",
+           (pc == nullptr ? "nullptr" : get_token_name(pc->type)));
+
+   if (ret)
+   {
+      LOG_FMT(LFPARAM, "Yup!\n");
+
+      if (!chunk_is_token(first_word, CT_TYPE))
+      {
+         set_chunk_type(first_word, CT_TYPE);
+      }
+      chunk_t *tmp = chunk_get_prev_ncnnl(first_word);
+
+      if (chunk_is_token(tmp, CT_STAR))
+      {
+         set_chunk_type(tmp, CT_PTR_TYPE);
+      }
+   }
+   else
+   {
+      LOG_FMT(LFPARAM, "Unlikely!\n");
+   }
    return(ret);
 } // can_be_full_param
 
@@ -249,7 +324,7 @@ bool chunk_ends_type(chunk_t *start)
       return(false);
    }
 
-   for ( ; pc != nullptr; pc = chunk_get_prev_ncnlni(pc)) // Issue #2279
+   for ( ; pc != nullptr; pc = chunk_get_prev_ncnnlni(pc)) // Issue #2279
    {
       LOG_FMT(LFTYPE, "%s(%d): type is %s, text() '%s', orig_line %zu, orig_col %zu\n   ",
               __func__, __LINE__, get_token_name(pc->type), pc->text(),
@@ -339,7 +414,8 @@ void flag_series(chunk_t *start, chunk_t *end, pcf_flags_t set_flags, pcf_flags_
 {
    LOG_FUNC_ENTRY();
 
-   while (start != nullptr && start != end)
+   while (  start != nullptr
+         && start != end)
    {
       chunk_flags_upd(start, clr_flags, set_flags);
 
@@ -363,7 +439,8 @@ size_t get_cpp_template_angle_nest_level(chunk_t *pc)
    LOG_FUNC_ENTRY();
    int nestLevel = 0;
 
-   while (pc != nullptr && pc->flags.test(PCF_IN_TEMPLATE))
+   while (  pc != nullptr
+         && pc->flags.test(PCF_IN_TEMPLATE))
    {
       if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
          && get_chunk_parent_type(pc) == CT_TEMPLATE)
@@ -375,7 +452,7 @@ size_t get_cpp_template_angle_nest_level(chunk_t *pc)
       {
          ++nestLevel;
       }
-      pc = chunk_get_prev_ncnlni(pc);
+      pc = chunk_get_prev_ncnnlni(pc);
    }
    return(nestLevel <= 0 ? 0 : size_t(nestLevel));
 }
@@ -387,10 +464,11 @@ chunk_t *get_d_template_types(ChunkStack &cs, chunk_t *open_paren)
    chunk_t *tmp       = open_paren;
    bool    maybe_type = true;
 
-   while (  ((tmp = chunk_get_next_ncnl(tmp)) != nullptr)
+   while (  ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
          && tmp->level > open_paren->level)
    {
-      if (chunk_is_token(tmp, CT_TYPE) || chunk_is_token(tmp, CT_WORD))
+      if (  chunk_is_token(tmp, CT_TYPE)
+         || chunk_is_token(tmp, CT_WORD))
       {
          if (maybe_type)
          {
@@ -410,14 +488,16 @@ chunk_t *get_d_template_types(ChunkStack &cs, chunk_t *open_paren)
 
 bool go_on(chunk_t *pc, chunk_t *start)
 {
-   if (pc == nullptr || pc->level != start->level)
+   if (  pc == nullptr
+      || pc->level != start->level)
    {
       return(false);
    }
 
    if (pc->flags.test(PCF_IN_FOR))
    {
-      return((!chunk_is_semicolon(pc)) && (!(chunk_is_token(pc, CT_COLON))));
+      return(  (!chunk_is_semicolon(pc))
+            && (!(chunk_is_token(pc, CT_COLON))));
    }
    return(!chunk_is_semicolon(pc));
 } // go_on
@@ -481,5 +561,5 @@ chunk_t *set_paren_parent(chunk_t *start, c_token_t parent)
       set_chunk_parent(end, parent);
    }
    LOG_FMT(LFLPAREN, "%s(%d):\n", __func__, __LINE__);
-   return(chunk_get_next_ncnl(end, scope_e::PREPROC));
+   return(chunk_get_next_ncnnl(end, scope_e::PREPROC));
 } // set_paren_parent
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.h
index f7f83d12..f7f83d12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/combine_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/combine_tools.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat.h
index 32fce459..32fce459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/compat_posix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_posix.cpp
index d5d5012f..c77c7a89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/compat_posix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_posix.cpp
@@ -5,18 +5,17 @@
  * @author  Ben Gardner
  * @license GPL v2+
  */
+
 #ifndef WIN32
 
 #include "uncrustify_types.h"
-#include <cstdlib>
-#include <string>
 
 
 bool unc_getenv(const char *name, std::string &str)
 {
    const char *val = getenv(name);
 
-   if (val)
+   if (val != nullptr)
    {
       str = val;
       return(true);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/compat_win32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_win32.cpp
index c713f01e..d7292466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/compat_win32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/compat_win32.cpp
@@ -56,7 +56,8 @@ bool unc_homedir(std::string &home)
    }
    std::string hd, hp;
 
-   if (unc_getenv("HOMEDRIVE", hd) && unc_getenv("HOMEPATH", hp))
+   if (  unc_getenv("HOMEDRIVE", hd)
+      && unc_getenv("HOMEPATH", hp))
    {
       home = hd + hp;
       return(true);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/config.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/config.h.in
index 4270a733..4270a733 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/config.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/config.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/cs_top_is_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.cpp
index d358912c..d358912c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/cs_top_is_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/cs_top_is_question.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.h
index 53adfe0a..de6ace3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/cs_top_is_question.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/cs_top_is_question.h
@@ -9,9 +9,7 @@
 #ifndef CS_TOP_IS_QUESTION_H_INCLUDED
 #define CS_TOP_IS_QUESTION_H_INCLUDED
 
-//#include "chunk_list.h"
 #include "ChunkStack.h"
-//#include "uncrustify_types.h"
 
 
 bool cs_top_is_question(ChunkStack &cs, size_t level);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/detect.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.cpp
index 12288afa..f3629e9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/detect.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.cpp
@@ -8,15 +8,8 @@
 
 #include "detect.h"
 
-#include "chunk_list.h"
-#include "ChunkStack.h"
 #include "prototypes.h"
-#include "unc_ctype.h"
-#include "uncrustify_types.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 using namespace uncrustify;
 
@@ -86,7 +79,8 @@ sp_votes::~sp_votes()
    {
       m_option = (m_force > m_add) ? IARF_FORCE : IARF_ADD;
    }
-   else if (m_force == 0 && m_add == 0)
+   else if (  m_force == 0
+           && m_add == 0)
    {
       m_option = IARF_REMOVE;
    }
@@ -167,7 +161,8 @@ static void detect_space_options(void)
          break;
       }
 
-      if (chunk_is_token(pc, CT_ARITH) || chunk_is_token(pc, CT_SHIFT))
+      if (  chunk_is_token(pc, CT_ARITH)
+         || chunk_is_token(pc, CT_SHIFT))
       {
          vote_sp_arith.vote(pc, next);
          vote_sp_arith.vote(prev, pc);
@@ -225,13 +220,16 @@ static void detect_space_options(void)
          vote_sp_inside_paren.vote(pc, next);
       }
 
-      if (  (chunk_is_paren_open(pc) && chunk_is_paren_open(next))
-         || (chunk_is_paren_close(pc) && chunk_is_paren_close(next)))
+      if (  (  chunk_is_paren_open(pc)
+            && chunk_is_paren_open(next))
+         || (  chunk_is_paren_close(pc)
+            && chunk_is_paren_close(next)))
       {
          vote_sp_paren_paren.vote(pc, next);
       }
 
-      if (chunk_is_paren_close(pc) && chunk_is_token(next, CT_BRACE_OPEN))
+      if (  chunk_is_paren_close(pc)
+         && chunk_is_token(next, CT_BRACE_OPEN))
       {
          vote_sp_paren_brace.vote(pc, next);
       }
@@ -271,7 +269,8 @@ static void detect_space_options(void)
       }
 
       if (  pc->type != CT_PTR_TYPE
-         && (chunk_is_token(prev, CT_QUALIFIER) || chunk_is_token(prev, CT_TYPE)))
+         && (  chunk_is_token(prev, CT_QUALIFIER)
+            || chunk_is_token(prev, CT_TYPE)))
       {
          vote_sp_after_type.vote(prev, pc);
       }
@@ -298,7 +297,8 @@ static void detect_space_options(void)
          {
             vote_sp_angle_paren.vote(prev, pc);
          }
-         else if (chunk_is_token(next, CT_WORD) || CharTable::IsKw1(next->str[0]))
+         else if (  chunk_is_token(next, CT_WORD)
+                 || CharTable::IsKw1(next->str[0]))
          {
             vote_sp_angle_word.vote(prev, pc);
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/detect.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.h
index 5c6ec1e2..5c6ec1e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/detect.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/detect.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/enum_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.cpp
index f3d43eb5..7c04fbb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/enum_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.cpp
@@ -8,11 +8,9 @@
 
 #include "enum_cleanup.h"
 
-#include "chunk_list.h"
 #include "log_rules.h"
-#include "logger.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
+
+constexpr static auto LCURRENT = LTOK;
 
 using namespace uncrustify;
 
@@ -37,7 +35,7 @@ void enum_cleanup(void)
       {
          LOG_FMT(LTOK, "%s(%d): orig_line is %zu, type is %s\n",
                  __func__, __LINE__, pc->orig_line, get_token_name(pc->type));
-         chunk_t *prev = chunk_get_prev_ncnlnp(pc);
+         chunk_t *prev = chunk_get_prev_ncnnlnp(pc);
 
          // test of (prev == nullptr) is not necessary
          if (chunk_is_token(prev, CT_COMMA))
@@ -68,6 +66,7 @@ void enum_cleanup(void)
                   comma.orig_line = prev->orig_line;
                   comma.orig_col  = prev->orig_col + 1;
                   comma.nl_count  = 0;
+                  comma.pp_level  = 0;
                   comma.flags     = PCF_NONE;
                   comma.str       = ",";
                   chunk_add_after(&comma, prev);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/enum_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.h
index 3853c8ea..3853c8ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/enum_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/enum_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_flags.h
index badd8226..badd8226 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/enum_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/enum_flags.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/error_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/error_types.h
index f0ebb502..f0ebb502 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/error_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/error_types.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.cpp
index 1d293266..7e5badac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.cpp
@@ -5,7 +5,9 @@
  */
 
 #include "chunk_list.h"
+
 #include "flag_braced_init_list.h"
+
 #include "uncrustify.h"
 
 
@@ -47,7 +49,7 @@ bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
             || get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)))
    {
       log_pcf_flags(LFCNR, pc->flags);
-      auto brace_open = chunk_get_next_ncnl(pc);
+      auto brace_open = chunk_get_next_ncnnl(pc);
 
       if (  chunk_is_token(brace_open, CT_BRACE_OPEN)
          && (  get_chunk_parent_type(brace_open) == CT_NONE
@@ -70,13 +72,13 @@ bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
 
 void flag_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
 {
-   auto brace_open  = chunk_get_next_ncnl(pc);
+   auto brace_open  = chunk_get_next_ncnnl(pc);
    auto brace_close = chunk_skip_to_match(next);
 
    set_chunk_parent(brace_open, CT_BRACED_INIT_LIST);
    set_chunk_parent(brace_close, CT_BRACED_INIT_LIST);
 
-   auto *tmp = chunk_get_next_ncnl(brace_close);
+   auto *tmp = chunk_get_next_ncnnl(brace_close);
 
    if (tmp != nullptr)
    {
@@ -98,7 +100,8 @@ void flag_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
    // for the case CT_ASSIGN (and others).
 
    // TODO: Move this block to the fix_fcn_call_args function.
-   if (chunk_is_token(pc, CT_WORD) && pc->flags.test(PCF_IN_FCN_CALL))
+   if (  chunk_is_token(pc, CT_WORD)
+      && pc->flags.test(PCF_IN_FCN_CALL))
    {
       set_chunk_type(pc, CT_TYPE);
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.h
index 4500a260..4500a260 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_braced_init_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_braced_init_list.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.cpp
index cd2f0885..c5cc0134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "chunk_list.h"
-#include "flag_decltype.h"
 
 
 bool flag_cpp_decltype(chunk_t *pc)
@@ -14,7 +13,7 @@ bool flag_cpp_decltype(chunk_t *pc)
 
    if (chunk_is_token(pc, CT_DECLTYPE))
    {
-      auto paren_open = chunk_get_next_ncnl(pc);
+      auto paren_open = chunk_get_next_ncnnl(pc);
 
       if (chunk_is_token(paren_open, CT_PAREN_OPEN))
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_decltype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.h
index f6946575..f6946575 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_decltype.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_decltype.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.cpp
index 251bfa2d..c0983745 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "flag_parens.h"
+
 #include "uncrustify.h"
 
 
@@ -37,7 +38,8 @@ chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token
    if (po != paren_close)
    {
       if (  flags != PCF_NONE
-         || (parent_all && parenttype != CT_NONE))
+         || (  parent_all
+            && parenttype != CT_NONE))
       {
          chunk_t *pc;
 
@@ -66,5 +68,5 @@ chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token
          set_chunk_parent(paren_close, parenttype);
       }
    }
-   return(chunk_get_next_ncnl(paren_close, scope_e::PREPROC));
+   return(chunk_get_next_ncnnl(paren_close, scope_e::PREPROC));
 } // flag_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.h
index 5c4d1e43..5c4d1e43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/flag_parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/flag_parens.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/frame_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.cpp
index f7f27a8b..54bbf8a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/frame_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.cpp
@@ -8,15 +8,8 @@
 
 #include "frame_list.h"
 
-#include "chunk_list.h"
-#include "error_types.h"
 #include "prototypes.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 namespace
 {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/frame_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.h
index eef2f00d..eef2f00d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/frame_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/frame_list.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.cpp
index cd30f5a6..fc6679ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.cpp
@@ -3,33 +3,25 @@
  * Does all the indenting stuff.
  *
  * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
+ * @author  Guy Maurel October 2015- 2021
  * @license GPL v2+
  */
 
 #include "indent.h"
 
 #include "align.h"
-#include "chunk_list.h"
-#include "error_types.h"
 #include "frame_list.h"
-#include "language_tools.h"
-#include "log_rules.h"
 #include "options_for_QT.h"
 #include "prototypes.h"
-#include "ParseFrame.h"
 #include "quick_align_again.h"
 #include "space.h"
-#include "unc_ctype.h"
-#include "unc_tools.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#ifdef WIN32
+#include <algorithm>                   // to get max
+#endif // ifdef WIN32
+
+
+constexpr static auto LCURRENT = LINDENT;
 
 using namespace std;
 using namespace uncrustify;
@@ -223,7 +215,8 @@ void align_to_column(chunk_t *pc, size_t column)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr || column == pc->column)
+   if (  pc == nullptr
+      || column == pc->column)
    {
       return;
    }
@@ -252,7 +245,8 @@ void align_to_column(chunk_t *pc, size_t column)
 
       auto almod = align_mode_e::SHIFT;
 
-      if (chunk_is_comment(pc) && get_chunk_parent_type(pc) != CT_COMMENT_EMBED)
+      if (  chunk_is_comment(pc)
+         && get_chunk_parent_type(pc) != CT_COMMENT_EMBED)
       {
          log_rule_B("indent_relative_single_line_comments");
          almod = (  chunk_is_single_line_comment(pc)
@@ -286,15 +280,18 @@ void align_to_column(chunk_t *pc, size_t column)
               (almod == align_mode_e::KEEP_ABS) ? "abs" :
               (almod == align_mode_e::KEEP_REL) ? "rel" : "sft",
               pc->text(), get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col);
-   } while (pc != nullptr && pc->nl_count == 0);
+   } while (  pc != nullptr
+           && pc->nl_count == 0);
 } // align_to_column
 
 
 void reindent_line(chunk_t *pc, size_t column)
 {
    LOG_FUNC_ENTRY();
+   char copy[1000];
+
    LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, on '%s' [%s/%s] => %zu\n",
-           __func__, __LINE__, pc->orig_line, pc->column, pc->text(),
+           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy),
            get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
            column);
    log_func_stack_inline(LINDLINE);
@@ -376,7 +373,8 @@ void reindent_line(chunk_t *pc, size_t column)
          }
          LOG_FMT(LINDLINED, " to %zu (orig %zu)\n", pc->column, pc->orig_col);
       }
-   } while (pc != nullptr && pc->nl_count == 0);
+   } while (  pc != nullptr
+           && pc->nl_count == 0);
 } // reindent_line
 
 
@@ -424,7 +422,8 @@ static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos)
    log_rule_B("indent_continue");
    const int ic = options::indent_continue();
 
-   if (ic < 0 && frm.at(pse_tos).indent_cont)
+   if (  ic < 0
+      && frm.at(pse_tos).indent_cont)
    {
       return(frm.at(pse_tos).indent);
    }
@@ -445,9 +444,10 @@ static chunk_t *candidate_chunk_first_on_line(chunk_t *pc)
    log_rule_B("indent_inside_ternary_operator");
 
    if (  options::indent_inside_ternary_operator()
-      && (chunk_is_token(first, CT_QUESTION) || chunk_is_token(first, CT_COND_COLON)))
+      && (  chunk_is_token(first, CT_QUESTION)
+         || chunk_is_token(first, CT_COND_COLON)))
    {
-      return(chunk_get_next_ncnl(first));
+      return(chunk_get_next_ncnnl(first));
    }
    else
    {
@@ -489,7 +489,8 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
    // Store the caret position
    chunk_t *caret_tmp = nullptr;
 
-   if (tmp != nullptr && tmp->type == CT_OC_BLOCK_CARET)
+   if (  tmp != nullptr
+      && tmp->type == CT_OC_BLOCK_CARET)
    {
       caret_tmp = tmp;
    }
@@ -500,7 +501,8 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
    }
 
    // If we still cannot find caret then return first chunk on the line
-   if (tmp == nullptr || tmp->type != CT_OC_BLOCK_CARET)
+   if (  tmp == nullptr
+      || tmp->type != CT_OC_BLOCK_CARET)
    {
       return(candidate_chunk_first_on_line(pc));
    }
@@ -514,7 +516,8 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
    // Check for colon in ':^TYPE *(ARGS) {'
    if (from_colon)
    {
-      if (tmp == nullptr || tmp->type != CT_OC_COLON)
+      if (  tmp == nullptr
+         || tmp->type != CT_OC_COLON)
       {
          return(candidate_chunk_first_on_line(pc));
       }
@@ -528,7 +531,8 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
    if (from_keyword)
    {
       if (  tmp == nullptr
-         || (tmp->type != CT_OC_MSG_NAME && tmp->type != CT_OC_MSG_FUNC))
+         || (  tmp->type != CT_OC_MSG_NAME
+            && tmp->type != CT_OC_MSG_FUNC))
       {
          return(candidate_chunk_first_on_line(pc));
       }
@@ -639,7 +643,8 @@ void indent_text(void)
       {
          string str = pc->text();
 
-         if ((str[0] == '@') && (chunk_get_prev(pc)->type == CT_NEWLINE))
+         if (  (str[0] == '@')
+            && (chunk_get_prev(pc)->type == CT_NEWLINE))
          {
             indent_column_set(1);
             reindent_line(pc, indent_column);
@@ -660,8 +665,9 @@ void indent_text(void)
       }
       else
       {
+         char copy[1000];
          LOG_FMT(LINDLINE, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, for '%s'\n   ",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->text());
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->elided_text(copy));
          log_pcf_flags(LINDLINE, pc->flags);
       }
       log_rule_B("use_options_overriding_for_qt_macros");
@@ -685,7 +691,7 @@ void indent_text(void)
       {
          if (!in_func_def)
          {
-            chunk_t *next = chunk_get_next_ncnl(pc);
+            chunk_t *next = chunk_get_next_ncnnl(pc);
 
             if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
                || (  chunk_is_token(pc, CT_COMMENT)
@@ -718,7 +724,8 @@ void indent_text(void)
 
       if (!in_preproc)
       {
-         while (!frm.empty() && frm.top().in_preproc)
+         while (  !frm.empty()
+               && frm.top().in_preproc)
          {
             const c_token_t type = frm.top().type;
             LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
@@ -742,7 +749,8 @@ void indent_text(void)
       {
          // Close out PP_IF_INDENT before playing with the parse frames
          if (  frm.top().type == CT_PP_IF_INDENT
-            && (get_chunk_parent_type(pc) == CT_PP_ENDIF || get_chunk_parent_type(pc) == CT_PP_ELSE))
+            && (  get_chunk_parent_type(pc) == CT_PP_ENDIF
+               || get_chunk_parent_type(pc) == CT_PP_ELSE))
          {
             LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                     __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
@@ -816,7 +824,8 @@ void indent_text(void)
             log_rule_B("pp_indent_case");
             log_rule_B("pp_indent_extern");
 
-            while (preproc_next != nullptr && preproc_next->type != CT_NEWLINE)
+            while (  preproc_next != nullptr
+                  && preproc_next->type != CT_NEWLINE)
             {
                if (  (  (  (chunk_is_token(preproc_next, CT_BRACE_OPEN))
                         || (chunk_is_token(preproc_next, CT_BRACE_CLOSE)))
@@ -844,7 +853,8 @@ void indent_text(void)
                set_chunk_type(next, memtype);
 
                // Indent one level except if the #if is a #include guard
-               size_t extra = (pc->pp_level == 0 && ifdef_over_whole_file())
+               size_t extra = (  pc->pp_level == 0
+                              && ifdef_over_whole_file())
                               ? 0 : indent_size;
 
                frm.top().indent = frm.prev().indent + extra;
@@ -870,21 +880,23 @@ void indent_text(void)
                   && frm.top().pop_pc
                   && frm.top().pc != frmbkup.top().pc)
                {
-                  chunk_t *tmp = chunk_get_next_ncnlnp(pc);
+                  chunk_t *tmp = chunk_get_next_ncnnlnp(pc);
 
                   if (tmp != nullptr)
                   {
-                     if (chunk_is_token(tmp, CT_WORD) || chunk_is_token(tmp, CT_TYPE))
+                     if (  chunk_is_token(tmp, CT_WORD)
+                        || chunk_is_token(tmp, CT_TYPE))
                      {
-                        tmp = chunk_get_next_ncnlnp(pc);
+                        tmp = chunk_get_next_ncnnlnp(pc);
                      }
-                     else if (chunk_is_token(tmp, CT_FUNC_CALL) || chunk_is_token(tmp, CT_FPAREN_OPEN))
+                     else if (  chunk_is_token(tmp, CT_FUNC_CALL)
+                             || chunk_is_token(tmp, CT_FPAREN_OPEN))
                      {
                         tmp = chunk_get_next_type(tmp, CT_FPAREN_CLOSE, tmp->level);
 
                         if (tmp != nullptr)
                         {
-                           tmp = chunk_get_next_ncnlnp(pc);
+                           tmp = chunk_get_next_ncnnlnp(pc);
                         }
                      }
 
@@ -999,7 +1011,8 @@ void indent_text(void)
                xml_indent -= options::indent_xml_string();
             }
          }
-         else if (!chunk_is_comment(pc) && !chunk_is_newline(pc))
+         else if (  !chunk_is_comment(pc)
+                 && !chunk_is_newline(pc))
          {
             xml_indent = 0;
          }
@@ -1045,7 +1058,7 @@ void indent_text(void)
             if (  chunk_is_token(pc, CT_BRACE_CLOSE)
                && get_chunk_parent_type(pc) == CT_ENUM)
             {
-               chunk_t *prev_ncnl = chunk_get_prev_ncnl(pc);
+               chunk_t *prev_ncnl = chunk_get_prev_ncnnl(pc);
                LOG_FMT(LINDLINE, "%s(%d): prev_ncnl is '%s', prev_ncnl->orig_line is %zu, prev_ncnl->orig_col is %zu\n",
                        __func__, __LINE__, prev_ncnl->text(), prev_ncnl->orig_line, prev_ncnl->orig_col);
 
@@ -1146,9 +1159,12 @@ void indent_text(void)
                chunk_t *next = chunk_get_next_nc(pc);
 
                while (  next != nullptr
-                     && (  (chunk_is_token(next, CT_BRACE_CLOSE) && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (chunk_is_token(next, CT_SQUARE_CLOSE) && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (chunk_is_token(next, CT_SQUARE_CLOSE) && get_chunk_parent_type(next) == CT_OC_MSG)))
+                     && (  (  chunk_is_token(next, CT_BRACE_CLOSE)
+                           && get_chunk_parent_type(next) == CT_OC_AT)
+                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
+                           && get_chunk_parent_type(next) == CT_OC_AT)
+                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
+                           && get_chunk_parent_type(next) == CT_OC_MSG)))
                {
                   count++;
                   next = chunk_get_next_nc(next);
@@ -1193,7 +1209,8 @@ void indent_text(void)
 
             // a case is ended with another case or a close brace
             if (  (frm.top().type == CT_CASE)
-               && (chunk_is_token(pc, CT_BRACE_CLOSE) || chunk_is_token(pc, CT_CASE)))
+               && (  chunk_is_token(pc, CT_BRACE_CLOSE)
+                  || chunk_is_token(pc, CT_CASE)))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
@@ -1222,7 +1239,8 @@ void indent_text(void)
 
             if (  options::indent_access_spec_body()
                && (frm.top().type == CT_ACCESS)
-               && (chunk_is_token(pc, CT_BRACE_CLOSE) || chunk_is_token(pc, CT_ACCESS)))
+               && (  chunk_is_token(pc, CT_BRACE_CLOSE)
+                  || chunk_is_token(pc, CT_ACCESS)))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
@@ -1241,7 +1259,8 @@ void indent_text(void)
 
             // an OC SCOPE ('-' or '+') ends with a semicolon or brace open
             if (  (frm.top().type == CT_OC_SCOPE)
-               && (chunk_is_semicolon(pc) || chunk_is_token(pc, CT_BRACE_OPEN)))
+               && (  chunk_is_semicolon(pc)
+                  || chunk_is_token(pc, CT_BRACE_OPEN)))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
@@ -1287,7 +1306,8 @@ void indent_text(void)
             if (  options::indent_oc_inside_msg_sel()
                && (frm.top().type != CT_SQUARE_OPEN)
                && frm.top().level >= pc->level
-               && (chunk_is_token(pc, CT_OC_MSG_FUNC) || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
+               && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
+                  || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
             {
                LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
@@ -1297,6 +1317,7 @@ void indent_text(void)
             // Close out parenthesis and squares
             if (  (frm.top().type == (pc->type - 1))
                && (  chunk_is_token(pc, CT_PAREN_CLOSE)
+                  || chunk_is_token(pc, CT_LPAREN_CLOSE)                     // Issue #3054
                   || chunk_is_token(pc, CT_SPAREN_CLOSE)
                   || chunk_is_token(pc, CT_FPAREN_CLOSE)
                   || chunk_is_token(pc, CT_SQUARE_CLOSE)
@@ -1356,8 +1377,9 @@ void indent_text(void)
                     frm.at(ttidx).pc->brace_level);
          }
       }
+      char copy[1000];
       LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->text());
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->elided_text(copy));
 
       // Issue #672
       if (  chunk_is_token(pc, CT_BRACE_OPEN)
@@ -1409,15 +1431,19 @@ void indent_text(void)
       {
          if (language_is_set(LANG_OC))
          {
-            if (frm.top().type == CT_BRACE_OPEN && frm.top().level >= pc->level)
+            if (  frm.top().type == CT_BRACE_OPEN
+               && frm.top().level >= pc->level)
             {
                size_t  count = 1;
                chunk_t *next = chunk_get_next_nc(pc);
 
                while (  next != nullptr
-                     && (  (chunk_is_token(next, CT_BRACE_CLOSE) && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (chunk_is_token(next, CT_SQUARE_CLOSE) && get_chunk_parent_type(next) == CT_OC_AT)
-                        || (chunk_is_token(next, CT_SQUARE_CLOSE) && get_chunk_parent_type(next) == CT_OC_MSG)))
+                     && (  (  chunk_is_token(next, CT_BRACE_CLOSE)
+                           && get_chunk_parent_type(next) == CT_OC_AT)
+                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
+                           && get_chunk_parent_type(next) == CT_OC_AT)
+                        || (  chunk_is_token(next, CT_SQUARE_CLOSE)
+                           && get_chunk_parent_type(next) == CT_OC_MSG)))
                {
                   count++;
                   next = chunk_get_next_nc(next);
@@ -1426,7 +1452,9 @@ void indent_text(void)
 
                // End Objc nested boxed dictionary
                // TODO: ideally formatting would know which opens occurred on a line and group closes in the same manor
-               if (count > 0 && chunk_is_token(pc, CT_BRACE_CLOSE) && get_chunk_parent_type(pc) == CT_OC_AT)
+               if (  count > 0
+                  && chunk_is_token(pc, CT_BRACE_CLOSE)
+                  && get_chunk_parent_type(pc) == CT_OC_AT)
                {
                   if (frm.top().ip.ref)
                   {
@@ -1522,7 +1550,8 @@ void indent_text(void)
          indent_column_set(frm.top().indent_tmp);
       }
       else if (  chunk_is_token(pc, CT_BRACE_OPEN)
-              && (pc->next != nullptr && pc->next->type != CT_NAMESPACE))
+              && (  pc->next != nullptr
+                 && pc->next->type != CT_NAMESPACE))
       {
          LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
                  __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
@@ -1541,6 +1570,70 @@ void indent_text(void)
          {
             log_rule_B("indent_cpp_lambda_body");
             frm.top().brace_indent = frm.prev().indent;
+
+            chunk_t *head     = chunk_get_prev_ncnnlnp(frm.top().pc);
+            chunk_t *tail     = nullptr;
+            bool    enclosure = frm.prev().pc != chunk_skip_to_match(frm.prev().pc);
+            bool    linematch = true;
+
+            for (auto it = frm.rbegin(); it != frm.rend() && tail == nullptr; ++it)
+            {
+               if (it->pc && it->pc != frm.top().pc)
+               {
+                  linematch &= are_chunks_in_same_line(it->pc, head);
+               }
+               chunk_t *match = chunk_skip_to_match(it->pc);
+
+               if (match == nullptr)
+               {
+                  continue;
+               }
+               chunk_t *target = chunk_get_next_ncnnlnp(match);
+
+               while (tail == nullptr && target != nullptr)
+               {
+                  if (chunk_is_semicolon(target) && target->level == match->level)
+                  {
+                     tail = target;
+                  }
+                  else if (target->level < match->level)
+                  {
+                     break;
+                  }
+                  else
+                  {
+                     target = chunk_get_next_ncnnlnp(target);
+                  }
+               }
+            }
+
+            bool toplevel = true;
+
+            for (auto it = frm.rbegin(); it != frm.rend() && tail != nullptr; ++it)
+            {
+               if (!chunk_is_token(it->pc, CT_FPAREN_OPEN))
+               {
+                  continue;
+               }
+
+               if (it->pc->level < tail->level)
+               {
+                  toplevel = false;
+                  break;
+               }
+            }
+
+            // A few things to check:
+            // 1. The matching brace is on the same line as the ending semicolon
+            // 2a. If it's an assignment, check that both sides of the assignment operator are on the same line
+            // 2b. If it's inside some closure, check that all the frames are on the same line, and it is in the top level closure
+            if (  options::align_assign_span() == 0 && are_chunks_in_same_line(chunk_skip_to_match(frm.top().pc), tail)
+               && (  (  !enclosure && are_chunks_in_same_line(chunk_get_prev_ncnnlnp(frm.prev().pc), frm.prev().pc)
+                     && are_chunks_in_same_line(frm.prev().pc, chunk_get_next_ncnnlnp(frm.prev().pc)))
+                  || (enclosure && linematch && toplevel)))
+            {
+               frm.top().brace_indent -= indent_size;
+            }
             indent_column_set(frm.top().brace_indent);
             frm.top().indent = indent_column + indent_size;
             log_indent();
@@ -1612,7 +1705,7 @@ void indent_text(void)
             frm.top().brace_indent = frm.prev().indent;
 
             // Issue # 1620, UNI-24090.cs
-            if (are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnlnp(frm.top().pc)))
+            if (are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnlnp(frm.top().pc)))
             {
                frm.top().brace_indent -= indent_size;
             }
@@ -1658,7 +1751,8 @@ void indent_text(void)
             frm.top().indent = indent_column + indent_size;
             log_indent();
 
-            if ((get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR) && pc->flags.test(PCF_IN_OC_MSG))
+            if (  (get_chunk_parent_type(pc) == CT_OC_BLOCK_EXPR)
+               && pc->flags.test(PCF_IN_OC_MSG))
             {
                frm.top().indent = frm.prev().indent_tmp + indent_size;
                log_indent();
@@ -1715,9 +1809,10 @@ void indent_text(void)
                   if (options::indent_oc_block_msg_xcode_style())
                   {
                      chunk_t *bbc           = chunk_skip_to_match(pc); // block brace close '}'
-                     chunk_t *bbc_next_ncnl = chunk_get_next_ncnl(bbc);
+                     chunk_t *bbc_next_ncnl = chunk_get_next_ncnnl(bbc);
 
-                     if (bbc_next_ncnl->type == CT_OC_MSG_NAME || bbc_next_ncnl->type == CT_OC_MSG_FUNC)
+                     if (  bbc_next_ncnl->type == CT_OC_MSG_NAME
+                        || bbc_next_ncnl->type == CT_OC_MSG_FUNC)
                      {
                         indent_from_brace   = false;
                         indent_from_colon   = false;
@@ -1781,7 +1876,7 @@ void indent_text(void)
                frm.top().indent = frm.prev().indent_tmp;
                log_indent();
             }
-            else if (  are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnlnp(frm.top().pc))
+            else if (  are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnlnp(frm.top().pc))
                     && !options::indent_align_paren()
                     && chunk_is_paren_open(frm.prev().pc)
                     && !pc->flags.test(PCF_ONE_LINER))
@@ -1794,7 +1889,8 @@ void indent_text(void)
                log_indent();
             }
             else if (  options::indent_oc_inside_msg_sel()
-                    && (frm.prev().type == CT_OC_MSG_FUNC || frm.prev().type == CT_OC_MSG_NAME)) // Issue #2658
+                    && (  frm.prev().type == CT_OC_MSG_FUNC
+                       || frm.prev().type == CT_OC_MSG_NAME)) // Issue #2658
             {
                log_rule_B("indent_oc_inside_msg_sel");
                // [Class Message:{<here>
@@ -1830,7 +1926,8 @@ void indent_text(void)
             log_indent();
          }
          else if (  (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
-                    || (!options::indent_compound_literal_return() && get_chunk_parent_type(pc) == CT_C_CAST))
+                    || (  !options::indent_compound_literal_return()
+                       && get_chunk_parent_type(pc) == CT_C_CAST))
                  && frm.prev().type == CT_RETURN)
          {
             log_rule_B("indent_compound_literal_return");
@@ -1982,7 +2079,7 @@ void indent_text(void)
              * { a++;
              *   b--; };
              */
-            chunk_t *next = chunk_get_next_ncnl(pc);
+            chunk_t *next = chunk_get_next_ncnnl(pc);
 
             if (next == nullptr)
             {
@@ -2012,7 +2109,8 @@ void indent_text(void)
             log_indent_tmp();
 
             // Update the indent_column if needed
-            if (brace_indent || parent_token_indent != 0)
+            if (  brace_indent
+               || parent_token_indent != 0)
             {
                indent_column_set(frm.top().indent_tmp);
                log_indent_tmp();
@@ -2098,7 +2196,7 @@ void indent_text(void)
       }
       else if (chunk_is_token(pc, CT_BREAK))
       {
-         chunk_t *prev = chunk_get_prev_ncnl(pc);
+         chunk_t *prev = chunk_get_prev_ncnnl(pc);
 
          if (  chunk_is_token(prev, CT_BRACE_CLOSE)
             && get_chunk_parent_type(prev) == CT_CASE)
@@ -2131,7 +2229,8 @@ void indent_text(void)
 
             chunk_t *next = chunk_get_next(chunk_get_next(pc));  // colon + possible statement
 
-            if (  next != nullptr && !chunk_is_newline(next)
+            if (  next != nullptr
+               && !chunk_is_newline(next)
                   // label (+ 2, because there is colon and space after it) must fit into indent
                && (val + static_cast<int>(pc->len()) + 2 <= static_cast<int>(pse_indent)))
             {
@@ -2215,6 +2314,13 @@ void indent_text(void)
          frm.top().indent_tab = frm.top().indent;
          log_indent_tmp();
 
+         if (  options::indent_before_class_colon() != 0
+            && chunk_is_token(pc, CT_CLASS_COLON))
+         {
+            log_rule_B("indent_before_class_colon");
+            frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_before_class_colon(), 0);
+            log_indent_tmp();
+         }
          indent_column_set(frm.top().indent_tmp);
 
          log_rule_B("indent_class_colon");
@@ -2233,7 +2339,8 @@ void indent_text(void)
             {
                chunk_t *next = chunk_get_next(pc);
 
-               if (next != nullptr && !chunk_is_newline(next))
+               if (  next != nullptr
+                  && !chunk_is_newline(next))
                {
                   frm.top().indent = next->column;
                   log_indent();
@@ -2280,7 +2387,8 @@ void indent_text(void)
             {
                chunk_t *next = chunk_get_next(pc);
 
-               if (next != nullptr && !chunk_is_newline(next))
+               if (  next != nullptr
+                  && !chunk_is_newline(next))
                {
                   frm.top().indent = next->column;
                   log_indent();
@@ -2290,7 +2398,8 @@ void indent_text(void)
       }
       else if (  chunk_is_token(pc, CT_PAREN_OPEN)
               && (  get_chunk_parent_type(pc) == CT_ASM
-                 || (chunk_get_prev_ncnl(pc) != nullptr && chunk_get_prev_ncnl(pc)->type == CT_ASM))
+                 || (  chunk_get_prev_ncnnl(pc) != nullptr
+                    && chunk_get_prev_ncnnl(pc)->type == CT_ASM))
               && options::indent_ignore_asm_block())
       {
          log_rule_B("indent_ignore_asm_block");
@@ -2317,6 +2426,7 @@ void indent_text(void)
          reindent_line(pc, indent_column);
       }
       else if (  chunk_is_token(pc, CT_PAREN_OPEN)
+              || chunk_is_token(pc, CT_LPAREN_OPEN)                     // Issue #3054
               || chunk_is_token(pc, CT_SPAREN_OPEN)
               || chunk_is_token(pc, CT_FPAREN_OPEN)
               || chunk_is_token(pc, CT_SQUARE_OPEN)
@@ -2339,7 +2449,8 @@ void indent_text(void)
          frm.top().indent = pc->column + pc->len();
          log_indent();
 
-         if (chunk_is_token(pc, CT_SQUARE_OPEN) && language_is_set(LANG_D))
+         if (  chunk_is_token(pc, CT_SQUARE_OPEN)
+            && language_is_set(LANG_D))
          {
             frm.top().indent_tab = frm.top().indent;
          }
@@ -2348,9 +2459,11 @@ void indent_text(void)
          log_rule_B("indent_align_paren");
 
          if (  options::indent_inside_ternary_operator()
-            && (chunk_is_token(pc, CT_FPAREN_OPEN) || chunk_is_token(pc, CT_PAREN_OPEN))
+            && (  chunk_is_token(pc, CT_FPAREN_OPEN)
+               || chunk_is_token(pc, CT_PAREN_OPEN))
             && frm.size() > 2
-            && (frm.prev().type == CT_QUESTION || frm.prev().type == CT_COND_COLON)
+            && (  frm.prev().type == CT_QUESTION
+               || frm.prev().type == CT_COND_COLON)
             && !options::indent_align_paren())
          {
             frm.top().indent = frm.prev().indent_tmp + indent_size;
@@ -2359,7 +2472,8 @@ void indent_text(void)
             frm.top().indent_tmp = frm.top().indent;
             log_indent_tmp();
          }
-         else if (  (chunk_is_token(pc, CT_FPAREN_OPEN) || chunk_is_token(pc, CT_ANGLE_OPEN))
+         else if (  (  chunk_is_token(pc, CT_FPAREN_OPEN)
+                    || chunk_is_token(pc, CT_ANGLE_OPEN))
                  && (  (  options::indent_func_call_param()
                        && (  get_chunk_parent_type(pc) == CT_FUNC_CALL
                           || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER))
@@ -2407,7 +2521,8 @@ void indent_text(void)
                      || are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
                   && (  frm.at(idx).type != CT_CLASS_COLON
                      && frm.at(idx).type != CT_CONSTR_COLON
-                     && !(frm.at(idx).type == CT_LAMBDA && chunk_get_prev_nc(frm.at(idx).pc)->type == CT_NEWLINE)))
+                     && !(  frm.at(idx).type == CT_LAMBDA
+                         && chunk_get_prev_nc(frm.at(idx).pc)->type == CT_NEWLINE)))
             {
                if (idx == 0)
                {
@@ -2445,7 +2560,8 @@ void indent_text(void)
          else if (  options::indent_oc_inside_msg_sel()
                  && chunk_is_token(pc, CT_PAREN_OPEN)
                  && frm.size() > 2
-                 && (frm.prev().type == CT_OC_MSG_FUNC || frm.prev().type == CT_OC_MSG_NAME)
+                 && (  frm.prev().type == CT_OC_MSG_FUNC
+                    || frm.prev().type == CT_OC_MSG_NAME)
                  && !options::indent_align_paren()) // Issue #2658
          {
             log_rule_B("indent_oc_inside_msg_sel");
@@ -2466,7 +2582,8 @@ void indent_text(void)
             log_rule_B("indent_align_paren");
             int idx = static_cast<int>(frm.size()) - 2;
 
-            while (idx > 0 && are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
+            while (  idx > 0
+                  && are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
             {
                if (idx == 0)
                {
@@ -2523,7 +2640,8 @@ void indent_text(void)
                {
                   sub = static_cast<int>(frm.size()) - 2;
 
-                  while (sub > 0 && are_chunks_in_same_line(frm.at(sub).pc, frm.top().pc))
+                  while (  sub > 0
+                        && are_chunks_in_same_line(frm.at(sub).pc, frm.top().pc))
                   {
                      if (sub == 0)
                      {
@@ -2536,7 +2654,8 @@ void indent_text(void)
                      skipped = true;
                   }
 
-                  if (  (frm.at(sub + 1).type == CT_CLASS_COLON || frm.at(sub + 1).type == CT_CONSTR_COLON)
+                  if (  (  frm.at(sub + 1).type == CT_CLASS_COLON
+                        || frm.at(sub + 1).type == CT_CONSTR_COLON)
                      && (chunk_is_token(frm.at(sub + 1).pc->prev, CT_NEWLINE)))
                   {
                      sub = sub + 1;
@@ -2550,7 +2669,8 @@ void indent_text(void)
             }
             else
             {
-               if (next != nullptr && !chunk_is_comment(next))
+               if (  next != nullptr
+                  && !chunk_is_comment(next))
                {
                   if (chunk_is_token(next, CT_SPACE))
                   {
@@ -2610,7 +2730,8 @@ void indent_text(void)
             if (  pc->level == pc->brace_level
                && (  chunk_is_token(pc, CT_FPAREN_OPEN)
                   || chunk_is_token(pc, CT_SPAREN_OPEN)
-                  || (chunk_is_token(pc, CT_SQUARE_OPEN) && get_chunk_parent_type(pc) != CT_OC_MSG)
+                  || (  chunk_is_token(pc, CT_SQUARE_OPEN)
+                     && get_chunk_parent_type(pc) != CT_OC_MSG)
                   || chunk_is_token(pc, CT_ANGLE_OPEN)))     // Issue #1170
             {
                //log_rule_B("indent_continue");
@@ -2674,7 +2795,7 @@ void indent_text(void)
          if (frm.top().type != CT_MEMBER)
          {
             frm.push(pc, __func__, __LINE__);
-            chunk_t *tmp = chunk_get_prev_ncnlnp(frm.top().pc);
+            chunk_t *tmp = chunk_get_prev_ncnnlnp(frm.top().pc);
 
             if (are_chunks_in_same_line(frm.prev().pc, tmp))
             {
@@ -2705,17 +2826,18 @@ void indent_text(void)
             }
          }
          //check for the series of CT_member chunks else pop it.
-         chunk_t *tmp = chunk_get_next_ncnlnp(pc);
+         chunk_t *tmp = chunk_get_next_ncnnlnp(pc);
 
          if (tmp != nullptr)
          {
             if (chunk_is_token(tmp, CT_FUNC_CALL))
             {
-               tmp = chunk_get_next_ncnlnp(chunk_get_next_type(tmp, CT_FPAREN_CLOSE, tmp->level));
+               tmp = chunk_get_next_ncnnlnp(chunk_get_next_type(tmp, CT_FPAREN_CLOSE, tmp->level));
             }
-            else if (chunk_is_token(tmp, CT_WORD) || chunk_is_token(tmp, CT_TYPE))
+            else if (  chunk_is_token(tmp, CT_WORD)
+                    || chunk_is_token(tmp, CT_TYPE))
             {
-               tmp = chunk_get_next_ncnlnp(tmp);
+               tmp = chunk_get_next_ncnnlnp(tmp);
             }
          }
 
@@ -2725,12 +2847,13 @@ void indent_text(void)
          {
             if (chunk_is_paren_close(tmp))
             {
-               tmp = chunk_get_prev_ncnlnp(tmp);
+               tmp = chunk_get_prev_ncnnlnp(tmp);
             }
 
-            if (tmp != nullptr && chunk_is_newline(tmp->prev))
+            if (  tmp != nullptr
+               && chunk_is_newline(tmp->prev))
             {
-               tmp = chunk_get_next_nl(chunk_get_prev_ncnlnp(tmp));
+               tmp = chunk_get_next_nl(chunk_get_prev_ncnnlnp(tmp));
             }
 
             if (tmp != nullptr)
@@ -2741,14 +2864,16 @@ void indent_text(void)
       }
       else if (  chunk_is_token(pc, CT_ASSIGN)
               || chunk_is_token(pc, CT_IMPORT)
-              || (chunk_is_token(pc, CT_USING) && language_is_set(LANG_CS)))
+              || (  chunk_is_token(pc, CT_USING)
+                 && language_is_set(LANG_CS)))
       {
          /*
           * if there is a newline after the '=' or the line starts with a '=',
           * just indent one level,
           * otherwise align on the '='.
           */
-         if (chunk_is_token(pc, CT_ASSIGN) && chunk_is_newline(chunk_get_prev(pc)))
+         if (  chunk_is_token(pc, CT_ASSIGN)
+            && chunk_is_newline(chunk_get_prev(pc)))
          {
             if (frm.top().type == CT_ASSIGN_NL)
             {
@@ -2775,7 +2900,8 @@ void indent_text(void)
              * assignments should be same and one more than this line's indent.
              * so poping the previous assign and pushing the new one
              */
-            if (frm.top().type == CT_ASSIGN && chunk_is_token(pc, CT_ASSIGN))
+            if (  frm.top().type == CT_ASSIGN
+               && chunk_is_token(pc, CT_ASSIGN))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
@@ -2783,7 +2909,8 @@ void indent_text(void)
             }
             frm.push(pc, __func__, __LINE__);
 
-            if (chunk_is_token(pc, CT_ASSIGN) && chunk_is_newline(chunk_get_prev(pc)))
+            if (  chunk_is_token(pc, CT_ASSIGN)
+               && chunk_is_newline(chunk_get_prev(pc)))
             {
                frm.top().type = CT_ASSIGN_NL;
             }
@@ -2835,7 +2962,8 @@ void indent_text(void)
                }
                log_indent();
 
-               if (chunk_is_token(pc, CT_ASSIGN) && chunk_is_newline(next))
+               if (  chunk_is_token(pc, CT_ASSIGN)
+                  && chunk_is_newline(next))
                {
                   frm.top().type       = CT_ASSIGN_NL;
                   frm.top().indent_tab = frm.top().indent;
@@ -2851,10 +2979,12 @@ void indent_text(void)
          }
       }
       else if (  chunk_is_token(pc, CT_RETURN)
-              || (chunk_is_token(pc, CT_THROW) && get_chunk_parent_type(pc) == CT_NONE))
+              || (  chunk_is_token(pc, CT_THROW)
+                 && get_chunk_parent_type(pc) == CT_NONE))
       {
          // don't count returns inside a () or []
-         if (pc->level == pc->brace_level)
+         if (  pc->level == pc->brace_level
+            || pc->flags.test(PCF_IN_LAMBDA))
          {
             chunk_t *next = chunk_get_next(pc);
 
@@ -2932,18 +3062,21 @@ void indent_text(void)
          /* TODO: make this configurable, obviously.. */
          if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
             || get_chunk_parent_type(pc) == CT_FUNC_PROTO
-            || (get_chunk_parent_type(pc) == CT_STRUCT && frm.top().type != CT_CLASS_COLON))
+            || (  get_chunk_parent_type(pc) == CT_STRUCT
+               && frm.top().type != CT_CLASS_COLON))
          {
             indent_column_set(frm.top().indent + 4);
          }
       }
       else if (  options::indent_inside_ternary_operator()
-              && (chunk_is_token(pc, CT_QUESTION) || chunk_is_token(pc, CT_COND_COLON))) // Issue #1130, #1715
+              && (  chunk_is_token(pc, CT_QUESTION)
+                 || chunk_is_token(pc, CT_COND_COLON))) // Issue #1130, #1715
       {
          log_rule_B("indent_inside_ternary_operator");
 
          // Pop any colons before because they should already be processed
-         while (chunk_is_token(pc, CT_COND_COLON) && frm.top().type == CT_COND_COLON)
+         while (  chunk_is_token(pc, CT_COND_COLON)
+               && frm.top().type == CT_COND_COLON)
          {
             frm.pop(__func__, __LINE__);
          }
@@ -2969,7 +3102,7 @@ void indent_text(void)
       }
       else if (  chunk_is_token(pc, CT_LAMBDA)
               && (language_is_set(LANG_CS | LANG_JAVA))
-              && chunk_get_next_ncnlnp(pc)->type != CT_BRACE_OPEN
+              && chunk_get_next_ncnnlnp(pc)->type != CT_BRACE_OPEN
               && options::indent_cs_delegate_body())
       {
          log_rule_B("indent_cs_delegate_body");
@@ -2977,14 +3110,16 @@ void indent_text(void)
          frm.top().indent = frm.prev().indent;
          log_indent();
 
-         if (chunk_is_newline(chunk_get_prev_nc(pc)) && !are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnl(pc)))
+         if (  chunk_is_newline(chunk_get_prev_nc(pc))
+            && !are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnl(pc)))
          {
             frm.top().indent = frm.prev().indent + indent_size;
             log_indent();
             reindent_line(pc, (frm.prev().indent + indent_size));
             did_newline = false;
          }
-         else if (chunk_is_newline(chunk_get_next_nc(pc)) && !are_chunks_in_same_line(frm.prev().pc, frm.top().pc))
+         else if (  chunk_is_newline(chunk_get_next_nc(pc))
+                 && !are_chunks_in_same_line(frm.prev().pc, frm.top().pc))
          {
             frm.top().indent = frm.prev().indent + indent_size;
          }
@@ -2993,8 +3128,9 @@ void indent_text(void)
          log_indent_tmp();
       }
       else if (  options::indent_oc_inside_msg_sel()
-              && (chunk_is_token(pc, CT_OC_MSG_FUNC) || chunk_is_token(pc, CT_OC_MSG_NAME))
-              && chunk_is_token(chunk_get_next_ncnl(pc), CT_OC_COLON)) // Issue #2658
+              && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
+                 || chunk_is_token(pc, CT_OC_MSG_NAME))
+              && chunk_is_token(chunk_get_next_ncnnl(pc), CT_OC_COLON)) // Issue #2658
       {
          log_rule_B("indent_oc_inside_msg_sel");
          // Pop the OC msg name that is on the top of the stack
@@ -3040,7 +3176,7 @@ void indent_text(void)
                LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
                        __func__, __LINE__);
 
-               tmp = chunk_get_prev_ncnl(tmp);
+               tmp = chunk_get_prev_ncnnl(tmp);
 
                if (chunk_is_token(tmp, CT_OPERATOR))
                {
@@ -3048,7 +3184,7 @@ void indent_text(void)
                }
                break;
             }
-            tmp = chunk_get_prev_ncnl(tmp);
+            tmp = chunk_get_prev_ncnnl(tmp);
          } while (  !in_shift
                  && tmp != nullptr
                  && tmp->type != CT_SEMICOLON
@@ -3062,15 +3198,16 @@ void indent_text(void)
 
          do
          {
-            tmp = chunk_get_next_ncnl(tmp);
+            tmp = chunk_get_next_ncnnl(tmp);
 
-            if (tmp != nullptr && chunk_is_token(tmp, CT_SHIFT))
+            if (  tmp != nullptr
+               && chunk_is_token(tmp, CT_SHIFT))
             {
                in_shift = true;
                LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
                        __func__, __LINE__);
 
-               tmp = chunk_get_prev_ncnl(tmp);
+               tmp = chunk_get_prev_ncnnl(tmp);
 
                if (chunk_is_token(tmp, CT_OPERATOR))
                {
@@ -3089,7 +3226,7 @@ void indent_text(void)
 
          LOG_FMT(LINDENT2, "%s(%d): in_shift is %s\n",
                  __func__, __LINE__, in_shift ? "TRUE" : "FALSE");
-         chunk_t *prev_nonl = chunk_get_prev_ncnl(pc);
+         chunk_t *prev_nonl = chunk_get_prev_ncnnl(pc);
          chunk_t *prev2     = chunk_get_prev_nc(pc);
 
          if ((  chunk_is_semicolon(prev_nonl)
@@ -3098,7 +3235,8 @@ void indent_text(void)
              || chunk_is_token(prev_nonl, CT_VBRACE_CLOSE)
              || chunk_is_token(prev_nonl, CT_VBRACE_OPEN)
              || chunk_is_token(prev_nonl, CT_CASE_COLON)
-             || (prev_nonl && prev_nonl->flags.test(PCF_IN_PREPROC)) != pc->flags.test(PCF_IN_PREPROC)
+             || (  prev_nonl != nullptr
+                && prev_nonl->flags.test(PCF_IN_PREPROC)) != pc->flags.test(PCF_IN_PREPROC)
              || chunk_is_token(prev_nonl, CT_COMMA)
              || is_operator))
          {
@@ -3107,7 +3245,8 @@ void indent_text(void)
          LOG_FMT(LINDENT2, "%s(%d): in_shift is %s\n",
                  __func__, __LINE__, in_shift ? "TRUE" : "FALSE");
 
-         if (chunk_is_token(prev2, CT_NEWLINE) && in_shift)
+         if (  chunk_is_token(prev2, CT_NEWLINE)
+            && in_shift)
          {
             shiftcontcol = calc_indent_continue(frm);
             // Setting frm.top().indent_cont = true in the top context when the indent is not also set
@@ -3121,7 +3260,8 @@ void indent_text(void)
 
             for (int i = frm.size() - 1; i >= 0; i--)
             {
-               if (frm.at(i).type == CT_RETURN || frm.at(i).type == CT_ASSIGN)
+               if (  frm.at(i).type == CT_RETURN
+                  || frm.at(i).type == CT_ASSIGN)
                {
                   need_workaround = true;
                   sub             = frm.size() - i;
@@ -3138,7 +3278,8 @@ void indent_text(void)
 
       // Handle variable definition continuation indenting
       if (  vardefcol == 0
-         && (chunk_is_token(pc, CT_WORD) || chunk_is_token(pc, CT_FUNC_CTOR_VAR))
+         && (  chunk_is_token(pc, CT_WORD)
+            || chunk_is_token(pc, CT_FUNC_CTOR_VAR))
          && !pc->flags.test(PCF_IN_FCN_DEF)
          && pc->flags.test(PCF_VAR_1ST_DEF))
       {
@@ -3160,8 +3301,9 @@ void indent_text(void)
          }
          else
          {
+            // Issue #3010
             vardefcol = pc->column;
-            // need to skip backward over any '*'
+            // BUT, we need to skip backward over any '*'
             chunk_t *tmp = chunk_get_prev_nc(pc);
 
             while (chunk_is_token(tmp, CT_PTR_TYPE))
@@ -3169,11 +3311,27 @@ void indent_text(void)
                vardefcol = tmp->column;
                tmp       = chunk_get_prev_nc(tmp);
             }
+            // BUT, we need to skip backward over any '::' or TYPE
+            //tmp = chunk_get_prev_nc(pc);
+
+            //if (chunk_is_token(tmp, CT_DC_MEMBER))
+            //{
+            //   // look for a type
+            //   chunk_t *tmp2 = chunk_get_prev_nc(tmp);
+            //   if (chunk_is_token(tmp2, CT_TYPE))
+            //   {
+            //      // we have something like "SomeLongNamespaceName::Foo()"
+            //      vardefcol = tmp2->column;
+            //      LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, vardefcol is %zu\n",
+            //              __func__, __LINE__, pc->orig_line, vardefcol);
+            //   }
+            //}
          }
       }
 
       if (  chunk_is_semicolon(pc)
-         || (chunk_is_token(pc, CT_BRACE_OPEN) && get_chunk_parent_type(pc) == CT_FUNCTION))
+         || (  chunk_is_token(pc, CT_BRACE_OPEN)
+            && get_chunk_parent_type(pc) == CT_FUNCTION))
       {
          vardefcol = 0;
       }
@@ -3191,7 +3349,7 @@ void indent_text(void)
             pc->indent.delta = frm.top().ip.delta;
          }
          LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->column_indent is %zu, indent_column is %zu, for '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->column_indent, indent_column, pc->text());
+                 __func__, __LINE__, pc->orig_line, pc->column_indent, indent_column, pc->elided_text(copy));
 
          /*
           * Check for special continuations.
@@ -3199,9 +3357,9 @@ void indent_text(void)
           * everything else
           */
 
-         auto prev  = chunk_get_prev_ncnl(pc);
-         auto prevv = chunk_get_prev_ncnl(prev);
-         auto next  = chunk_get_next_ncnl(pc);
+         auto prev  = chunk_get_prev_ncnnl(pc);
+         auto prevv = chunk_get_prev_ncnnl(prev);
+         auto next  = chunk_get_next_ncnnl(pc);
 
          bool do_vardefcol = false;
 
@@ -3216,7 +3374,7 @@ void indent_text(void)
 
             while (chunk_is_token(tmp, CT_PTR_TYPE))
             {
-               tmp = chunk_get_next_ncnl(tmp);
+               tmp = chunk_get_next_ncnnl(tmp);
             }
             LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, for '%s'",
                     __func__, __LINE__, tmp->orig_line, tmp->text());
@@ -3224,11 +3382,13 @@ void indent_text(void)
             log_pcf_flags(LINDENT2, tmp->flags);                   // Issue #2332
 
             if (  tmp->flags.test(PCF_VAR_DEF)
-               && (chunk_is_token(tmp, CT_WORD) || chunk_is_token(tmp, CT_FUNC_CTOR_VAR)))
+               && (  chunk_is_token(tmp, CT_WORD)
+                  || chunk_is_token(tmp, CT_FUNC_CTOR_VAR)))
             {
                do_vardefcol = true;
             }
          }
+         //LOG_FMT(LINDENT2, "%s(%d): GUY 2:\n", __func__, __LINE__);
 
          if (pc->flags.test(PCF_DONT_INDENT))
          {
@@ -3304,7 +3464,8 @@ void indent_text(void)
                     __func__, __LINE__, pc->orig_line, indent_column, pc->text());
             reindent_line(pc, indent_column);
          }
-         else if (chunk_is_paren_close(pc) || chunk_is_token(pc, CT_ANGLE_CLOSE))
+         else if (  chunk_is_paren_close(pc)
+                 || chunk_is_token(pc, CT_ANGLE_CLOSE))
          {
             /*
              * This is a big hack. We assume that since we hit a paren close,
@@ -3403,15 +3564,17 @@ void indent_text(void)
                            search = chunk_skip_to_match_rev(search);
 
                            if (  options::indent_oc_inside_msg_sel()
-                              && chunk_is_token(chunk_get_prev_ncnl(search), CT_OC_COLON)
-                              && (frm.top().type == CT_OC_MSG_FUNC || frm.top().type == CT_OC_MSG_NAME)) // Issue #2658
+                              && chunk_is_token(chunk_get_prev_ncnnl(search), CT_OC_COLON)
+                              && (  frm.top().type == CT_OC_MSG_FUNC
+                                 || frm.top().type == CT_OC_MSG_NAME)) // Issue #2658
                            {
                               log_rule_B("indent_oc_inside_msg_sel");
                               // [Class Message:(...)<here>
                               indent_column_set(frm.top().pc->column);
                            }
                            else if (  options::indent_inside_ternary_operator()
-                                   && (frm.top().type == CT_QUESTION || frm.top().type == CT_COND_COLON)) // Issue #1130, #1715
+                                   && (  frm.top().type == CT_QUESTION
+                                      || frm.top().type == CT_COND_COLON)) // Issue #1130, #1715
                            {
                               log_rule_B("indent_inside_ternary_operator");
                               indent_column_set(frm.top().indent);
@@ -3467,9 +3630,13 @@ void indent_text(void)
          else if (chunk_is_token(pc, CT_COMMA))
          {
             log_rule_B("indent_comma_paren");
+            bool comma_paren = options::indent_comma_paren()
+                               && chunk_is_paren_open(frm.top().pc);
+            log_rule_B("indent_comma_brace");
+            bool comma_brace = options::indent_comma_brace()
+                               && chunk_is_opening_brace(frm.top().pc);
 
-            if (  options::indent_comma_paren()
-               && chunk_is_paren_open(frm.top().pc))
+            if (comma_paren || comma_brace)
             {
                indent_column_set(frm.top().pc->column);
             }
@@ -3559,7 +3726,7 @@ void indent_text(void)
 
             if (tmp != nullptr)
             {
-               tmp = chunk_get_next_ncnl(tmp);
+               tmp = chunk_get_next_ncnnl(tmp);
 
                if (tmp != nullptr)
                {
@@ -3583,7 +3750,8 @@ void indent_text(void)
             }
          }
          else if (  options::indent_oc_inside_msg_sel()
-                 && (chunk_is_token(pc, CT_OC_MSG_FUNC) || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
+                 && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
+                    || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
          {
             log_rule_B("indent_oc_inside_msg_sel");
             reindent_line(pc, frm.top().indent);
@@ -3618,7 +3786,8 @@ void indent_text(void)
             LOG_FMT(LINDENT, "%s(%d): pc->line is %zu, pc->column is %zu, pc->text() is '%s, indent_column is %zu\n",
                     __func__, __LINE__, pc->orig_line, pc->column, pc->text(), indent_column);
 
-            if (use_indent && pc->type != CT_PP_IGNORE) // Leave indentation alone for PP_IGNORE tokens
+            if (  use_indent
+               && pc->type != CT_PP_IGNORE) // Leave indentation alone for PP_IGNORE tokens
             {
                log_rule_B("pos_conditional");
 
@@ -3845,13 +4014,15 @@ void indent_text(void)
 null_pc:
 
    // Throw out any stuff inside a preprocessor - no need to warn
-   while (!frm.empty() && frm.top().in_preproc)
+   while (  !frm.empty()
+         && frm.top().in_preproc)
    {
       frm.pop(__func__, __LINE__);
    }
 
    // Throw out any VBRACE_OPEN at the end - implied with the end of file
-   while (!frm.empty() && frm.top().type == CT_VBRACE_OPEN)
+   while (  !frm.empty()
+         && frm.top().type == CT_VBRACE_OPEN)
    {
       frm.pop(__func__, __LINE__);
    }
@@ -3889,7 +4060,8 @@ static bool single_line_comment_indent_rule_applies(chunk_t *start)
    {
       if (chunk_is_newline(pc))
       {
-         if (nl_count > 0 || pc->nl_count > 1)
+         if (  nl_count > 0
+            || pc->nl_count > 1)
          {
             return(false);
          }
@@ -3899,7 +4071,8 @@ static bool single_line_comment_indent_rule_applies(chunk_t *start)
       {
          nl_count = 0;
       }
-      else if (chunk_is_token(pc, CT_COMMENT_MULTI) || chunk_is_closing_brace(pc))
+      else if (  chunk_is_token(pc, CT_COMMENT_MULTI)
+              || chunk_is_closing_brace(pc))
       {
          /*
           * check for things we wouldn't want to indent the comment for
@@ -3947,7 +4120,8 @@ static size_t calc_comment_next_col_diff(chunk_t *pc)
       LOG_FMT(LCMTIND, "%s(%d): newline_token->text() is '%s', orig_line is %zu, orig_col is %zu\n",
               __func__, __LINE__, newline_token->text(), newline_token->orig_line, newline_token->orig_col);
 
-      if (newline_token == nullptr || newline_token->nl_count > 1)
+      if (  newline_token == nullptr
+         || newline_token->nl_count > 1)
       {
          return(5000);  // FIXME: Max thresh magic number 5000
       }
@@ -3976,8 +4150,10 @@ static size_t calc_comment_next_col_diff(chunk_t *pc)
 static void indent_comment(chunk_t *pc, size_t col)
 {
    LOG_FUNC_ENTRY();
+   char copy[1000];
+
    LOG_FMT(LCMTIND, "%s(%d): pc->text() is '%s', orig_line %zu, orig_col %zu, level %zu\n",
-           __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col, pc->level);
+           __func__, __LINE__, pc->elided_text(copy), pc->orig_line, pc->orig_col, pc->level);
 
    // force column 1 comment to column 1 if not changing them
    log_rule_B("indent_col1_comment");
@@ -4011,7 +4187,8 @@ static void indent_comment(chunk_t *pc, size_t col)
          log_pcf_flags(LCMTIND, prev->flags);
       }
 
-      if (chunk_is_comment(prev) && nl->nl_count == 1)
+      if (  chunk_is_comment(prev)
+         && nl->nl_count == 1)
       {
          const size_t prev_col_diff = (prev->orig_col > pc->orig_col)
                                       ? prev->orig_col - pc->orig_col
@@ -4077,16 +4254,20 @@ bool ifdef_over_whole_file(void)
    }
    chunk_t *start_pp = nullptr;
    chunk_t *end_pp   = nullptr;
-   size_t  stage     = 0;
+   size_t  IFstage   = 0;
 
    for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
    {
-      if (chunk_is_comment(pc) || chunk_is_newline(pc))
+      LOG_FMT(LNOTE, "%s(%d): pc->pp_level is %zu, pc->orig_line is %zu, pc->orig_col is %zu, pc->text() is '%s'\n",
+              __func__, __LINE__, pc->pp_level, pc->orig_line, pc->orig_col, pc->text());
+
+      if (  chunk_is_comment(pc)
+         || chunk_is_newline(pc))
       {
          continue;
       }
 
-      if (stage == 0)
+      if (IFstage == 0)                   // 0 is BEGIN
       {
          // Check the first preprocessor, make sure it is an #if type
          if (pc->type != CT_PREPROC)
@@ -4095,35 +4276,40 @@ bool ifdef_over_whole_file(void)
          }
          chunk_t *next = chunk_get_next(pc);
 
-         if (next == nullptr || next->type != CT_PP_IF)
+         if (  next == nullptr
+            || next->type != CT_PP_IF)
          {
             break;
          }
-         stage    = 1;
+         IFstage  = 1;                      // 1 is CT_PP_IF found
          start_pp = pc;
       }
-      else if (stage == 1)
+      else if (IFstage == 1)                // 1 is CT_PP_IF found
       {
          // Scan until a preprocessor at level 0 is found - the close to the #if
-         if (chunk_is_token(pc, CT_PREPROC) && pc->pp_level == 0)
+         if (chunk_is_token(pc, CT_PREPROC))
          {
-            stage  = 2;
-            end_pp = pc;
+            if (pc->pp_level == 0)
+            {
+               IFstage = 2;
+               end_pp  = pc;
+            }
          }
          continue;
       }
-      else if (stage == 2)
+      else if (IFstage == 2)
       {
          // We should only see the rest of the preprocessor
-         if (chunk_is_token(pc, CT_PREPROC) || !pc->flags.test(PCF_IN_PREPROC))
+         if (  chunk_is_token(pc, CT_PREPROC)
+            || !pc->flags.test(PCF_IN_PREPROC))
          {
-            stage = 0;
+            IFstage = 0;
             break;
          }
       }
    }
 
-   cpd.ifdef_over_whole_file = (stage == 2) ? 1 : -1;
+   cpd.ifdef_over_whole_file = (IFstage == 2) ? 1 : -1;
 
    if (cpd.ifdef_over_whole_file > 0)
    {
@@ -4145,11 +4331,14 @@ void indent_preproc(void)
 
    for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
    {
+      LOG_FMT(LPPIS, "%s(%d): orig_line is %zu, orig_col is %zu, pc->text() is '%s'\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+
       if (pc->type != CT_PREPROC)
       {
          continue;
       }
-      chunk_t *next = chunk_get_next_ncnl(pc);
+      chunk_t *next = chunk_get_next_ncnnl(pc);
 
       if (next == nullptr)
       {
@@ -4174,12 +4363,14 @@ void indent_preproc(void)
       // Add spacing by adjusting the length
       log_rule_B("pp_space");
 
-      if ((options::pp_space() != IARF_IGNORE) && next != nullptr)
+      if (  (options::pp_space() != IARF_IGNORE)
+         && next != nullptr)
       {
          if (options::pp_space() & IARF_ADD)
          {
             log_rule_B("pp_space_count");
-            const auto mult = max<size_t>(options::pp_space_count(), 1);
+            // Issue #3055
+            const size_t mult = max<size_t>(options::pp_space_count(), 1);
             reindent_line(next, pc->column + pc->len() + (pp_level * mult));
          }
          else if (options::pp_space() & IARF_REMOVE)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.h
index dc703eed..dc703eed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/keywords.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.cpp
index 8769615d..5e4be691 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/keywords.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.cpp
@@ -11,17 +11,8 @@
 #include "keywords.h"
 
 #include "args.h"
-#include "char_table.h"
-#include "language_tools.h"
 #include "prototypes.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_limits.h"
-#include "uncrustify_types.h"
-
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
+
 #include <map>
 
 
@@ -367,7 +358,8 @@ void init_keywords()
    {
       chunk_tag_t *tag = &keywords[idx];
 
-      if ((tag->lang_flags == LANG_ALL) || (tag->lang_flags == LANG_ALLC))
+      if (  (tag->lang_flags == LANG_ALL)
+         || (tag->lang_flags == LANG_ALLC))
       {
          continue;
       }
@@ -505,7 +497,8 @@ c_token_t find_keyword_type(const char *word, size_t len)
 
    if (p_ret != nullptr)
    {
-      if (strcmp(p_ret->tag, "__pragma") == 0 || strcmp(p_ret->tag, "_Pragma") == 0)
+      if (  strcmp(p_ret->tag, "__pragma") == 0
+         || strcmp(p_ret->tag, "_Pragma") == 0)
       {
          cpd.in_preproc = CT_PREPROC;
       }
@@ -550,7 +543,8 @@ int load_keyword_file(const char *filename)
 
       if (argc > 0)
       {
-         if (argc == 1 && CharTable::IsKw1(*args[0]))
+         if (  argc == 1
+            && CharTable::IsKw1(*args[0]))
          {
             add_keyword(args[0], CT_TYPE);
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/keywords.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.h
index 3a6f9ea5..3a6f9ea5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/keywords.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/keywords.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/lang_pawn.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.cpp
index 46518688..a3b3ed65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/lang_pawn.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.cpp
@@ -8,12 +8,7 @@
 
 #include "lang_pawn.h"
 
-#include "chunk_list.h"
-#include "ChunkStack.h"
-#include "language_tools.h"
 #include "prototypes.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
 using namespace uncrustify;
 
@@ -63,14 +58,16 @@ chunk_t *pawn_add_vsemi_after(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (chunk_is_token(pc, CT_VSEMICOLON) || chunk_is_token(pc, CT_SEMICOLON))
+   if (  chunk_is_token(pc, CT_VSEMICOLON)
+      || chunk_is_token(pc, CT_SEMICOLON))
    {
       return(pc);
    }
    chunk_t *next = chunk_get_next_nc(pc);
 
    if (  next != nullptr
-      && (chunk_is_token(next, CT_VSEMICOLON) || chunk_is_token(next, CT_SEMICOLON)))
+      && (  chunk_is_token(next, CT_VSEMICOLON)
+         || chunk_is_token(next, CT_SEMICOLON)))
    {
       return(pc);
    }
@@ -91,6 +88,8 @@ chunk_t *pawn_add_vsemi_after(chunk_t *pc)
 
 void pawn_scrub_vsemi(void)
 {
+   constexpr static auto LCURRENT = LPVSEMI;
+
    LOG_FUNC_ENTRY();
 
    log_rule_B("mod_pawn_semicolon");
@@ -106,7 +105,7 @@ void pawn_scrub_vsemi(void)
       {
          continue;
       }
-      chunk_t *prev = chunk_get_prev_ncnl(pc);
+      chunk_t *prev = chunk_get_prev_ncnnl(pc);
 
       if (chunk_is_token(prev, CT_BRACE_CLOSE))
       {
@@ -208,7 +207,8 @@ static chunk_t *pawn_process_line(chunk_t *start)
    //LOG_FMT(LSYS, "%s: %d - %s\n", __func__,
    //        start->orig_line, start->text());
 
-   if (chunk_is_token(start, CT_NEW) || chunk_is_str(start, "const", 5))
+   if (  chunk_is_token(start, CT_NEW)
+      || chunk_is_str(start, "const", 5))
    {
       return(pawn_process_variable(start));
    }
@@ -272,7 +272,8 @@ static chunk_t *pawn_process_variable(chunk_t *start)
          && prev != nullptr                          // Issue 2586
          && !pawn_continued(prev, start->level))
       {
-         if (prev->type != CT_VSEMICOLON && prev->type != CT_SEMICOLON)
+         if (  prev->type != CT_VSEMICOLON
+            && prev->type != CT_SEMICOLON)
          {
             pawn_add_vsemi_after(prev);
          }
@@ -347,7 +348,8 @@ static chunk_t *pawn_mark_function0(chunk_t *start, chunk_t *fcn)
    }
    else
    {
-      if (chunk_is_token(start, CT_FORWARD) || chunk_is_token(start, CT_NATIVE))
+      if (  chunk_is_token(start, CT_FORWARD)
+         || chunk_is_token(start, CT_NATIVE))
       {
          LOG_FMT(LPFUNC, "%s: %zu] '%s' [%s] proto due to %s\n",
                  __func__, fcn->orig_line, fcn->text(),
@@ -377,7 +379,7 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
     * we need to add virtual braces around the function body.
     */
    chunk_t *clp  = chunk_get_next_str(pc, ")", 1, 0);
-   chunk_t *last = chunk_get_next_ncnl(clp);
+   chunk_t *last = chunk_get_next_ncnnl(clp);
 
    if (last != nullptr)
    {
@@ -386,7 +388,8 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
    }
 
    // See if there is a state clause after the function
-   if (last != nullptr && chunk_is_str(last, "<", 1))
+   if (  last != nullptr
+      && chunk_is_str(last, "<", 1))
    {
       LOG_FMT(LPFUNC, "%s: %zu] '%s' has state angle open %s\n",
               __func__, pc->orig_line, pc->text(), get_token_name(last->type));
@@ -407,7 +410,7 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
          set_chunk_type(last, CT_ANGLE_CLOSE);
          set_chunk_parent(last, CT_FUNC_DEF);
       }
-      last = chunk_get_next_ncnl(last);
+      last = chunk_get_next_ncnnl(last);
    }
 
    if (last == nullptr)
@@ -444,16 +447,17 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
       last = prev;
 
       // find the next newline at level 0
-      prev = chunk_get_next_ncnl(prev);
+      prev = chunk_get_next_ncnnl(prev);
 
       do
       {
          LOG_FMT(LPFUNC, "%s:%zu] check %s, level %zu\n",
                  __func__, prev->orig_line, get_token_name(prev->type), prev->level);
 
-         if (chunk_is_token(prev, CT_NEWLINE) && prev->level == 0)
+         if (  chunk_is_token(prev, CT_NEWLINE)
+            && prev->level == 0)
          {
-            chunk_t *next = chunk_get_next_ncnl(prev);
+            chunk_t *next = chunk_get_next_ncnnl(prev);
 
             if (  next != nullptr
                && next->type != CT_ELSE
@@ -501,7 +505,7 @@ chunk_t *pawn_check_vsemicolon(chunk_t *pc)
     *  - it is something that needs a continuation
     *    + arith, assign, bool, comma, compare
     */
-   chunk_t *prev = chunk_get_prev_ncnl(pc);
+   chunk_t *prev = chunk_get_prev_ncnnl(pc);
 
    if (  prev == nullptr
       || prev == vb_open
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/lang_pawn.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.h
index 01fd5908..01fd5908 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/lang_pawn.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/lang_pawn.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/language_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.cpp
index 77e577f4..77e577f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/language_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/language_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.h
index 5f57c3f1..5f57c3f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/language_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/language_tools.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_levels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_levels.h
new file mode 100644
index 00000000..d809514a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_levels.h
@@ -0,0 +1,138 @@
+/**
+ * @file log_levels.h
+ *
+ * Enum for log levels.
+ * Use these for the log severities in LOG_FMT(), etc.
+ *
+ * @author  Ben Gardner
+ * @author  Guy Maurel October 2015- 2021
+ * @license GPL v2+
+ */
+
+#ifndef LOG_LEVELS_H_INCLUDED
+#define LOG_LEVELS_H_INCLUDED
+
+/**
+ * list of available log levels
+ *
+ * The user defines which log level is active using the
+ * -L or -log option.
+ * use -L A to set all the levels
+ * All messages which have a level that is active will be stored to the log
+ * file.
+ * All other log messages will be discarded.
+ * Different parts of the software use different log levels.
+ * This allows to log only operations of a specific operation.
+ * This eases debugging.
+ * To get all log messages use the option -La
+ * By default only system messages (level=LSYS) are logged.
+ */
+enum log_sev_t
+{
+   LSYS      = 0,   //! system messages
+   LERR      = 1,   //! error messages
+   LWARN     = 2,   //! warnings
+   LNOTE     = 3,   //! user notifications
+   LINFO     = 4,   //! user informations
+   LDATA     = 5,   //! data logging
+
+   LFILELIST = 8,   //! Files in the file list file
+   LLINEENDS = 9,   //! Show which line endings are used
+   LCASTS    = 10,  //! align casts
+   LALBR     = 11,  //! align braces
+   LALTD     = 12,  //! Align Typedef
+   LALPP     = 13,  //! align #define
+   LALPROTO  = 14,  //! align prototype
+   LALNLC    = 15,  //! align backslash-newline
+   LALTC     = 16,  //! align trailing comments
+   LALADD    = 17,  //! align add
+   LALASS    = 18,  //! align assign
+   LFVD      = 19,  //! fix_var_def
+   LFVD2     = 20,  //! fix_var_def-2
+   LINDENT   = 21,  //! indent_text
+   LINDENT2  = 22,  //! indent_text tab level
+   LINDPSE   = 23,  //! indent_text stack
+   LINDPC    = 24,  //! indent play-by-play
+   LNEWLINE  = 25,  //! newlines
+   LPF       = 26,  //! Parse Frame
+   LSTMT     = 27,  //! Marking statements/expressions
+   LTOK      = 28,  //! Tokenize
+   LALRC     = 29,  //! align right comment
+   LCMTIND   = 30,  //! Comment Indent
+   LINDLINE  = 31,  //! indent line
+   LSIB      = 32,  //! Scan IB
+   LRETURN   = 33,  //! add/remove parens for return
+   LBRDEL    = 34,  //! brace removal
+   LFCN      = 35,  //! function detection
+   LFCNP     = 36,  //! function parameters
+   LPCU      = 37,  //! parse cleanup
+   LDYNKW    = 38,  //! dynamic keywords
+   LOUTIND   = 39,  //! output indent
+   LBCSAFTER = 40,  //! Brace cleanup stack - after each token
+   LBCSPOP   = 41,  //! Brace cleanup stack - log pops
+   LBCSPUSH  = 42,  //! Brace cleanup stack - log push
+   LBCSSWAP  = 43,  //! Brace cleanup stack - log swaps
+   LFTOR     = 44,  //! Class Ctor or Dtor
+   LAS       = 45,  //! align_stack
+   LPPIS     = 46,  //! Preprocessor Indent and Space
+   LTYPEDEF  = 47,  //! Typedef and function types
+   LVARDEF   = 48,  //! Variable def marking
+   LDEFVAL   = 49,  //! define values
+   LPVSEMI   = 50,  //! Pawn: virtual semicolons
+   LPFUNC    = 51,  //! Pawn: function recognition
+   LSPLIT    = 52,  //! Line splitting
+   LFTYPE    = 53,  //! Function type detection
+   LTEMPL    = 54,  //! Template detection
+   LPARADD   = 55,  //! adding parens in if/while
+   LPARADD2  = 56,  //! adding parens in if/while - details
+   LBLANKD   = 57,  //! blank line details
+   LTEMPFUNC = 58,  //! Template function detection
+   LSCANSEMI = 59,  //! scan semicolon removal
+   LDELSEMI  = 60,  //! Removing semicolons
+   LFPARAM   = 61,  //! Testing for a full parameter
+   LNL1LINE  = 62,  //! NL check for 1 liners
+   LPFCHK    = 63,  //! Parse Frame check function call
+   LAVDB     = 64,  //! align var def braces
+   LSORT     = 65,  //! Sorting
+   LSPACE    = 66,  //! Space
+   LALIGN    = 67,  //! align
+   LALAGAIN  = 68,  //! align again
+   LOPERATOR = 69,  //! operator
+   LASFCP    = 70,  //! Align Same Function Call Params
+   LINDLINED = 71,  //! indent line details
+   LBCTRL    = 72,  //! beautifier control
+   LRMRETURN = 73,  //! remove 'return;'
+   LPPIF     = 74,  //! #if/#else/#endif pair processing
+   LMCB      = 75,  //! mod_case_brace
+   LBRCH     = 76,  //! if brace chain
+   LFCNR     = 77,  //! function return type
+   LOCCLASS  = 78,  //! OC Class stuff
+   LOCMSG    = 79,  //! OC Message stuff
+   LBLANK    = 80,  //! Blank Lines
+   LOBJCWORD = 81,  //! Convert keyword to CT_WORD in certain circumstances
+   LCHANGE   = 82,  //! something changed
+   LCONTTEXT = 83,  //! comment cont_text set
+   LANNOT    = 84,  //! Java annotation
+   LOCBLK    = 85,  //! OC Block stuff
+   LFLPAREN  = 86,  //! Flag paren
+   LOCMSGD   = 87,  //! OC Message declaration
+   LINDENTAG = 88,  //! indent again
+   LNFD      = 89,  //! newline-function-def
+   LJDBI     = 90,  //! Java Double Brace Init
+   LSETPAR   = 91,  //! set_chunk_parent()
+   LSETTYP   = 92,  //! set_chunk_type()
+   LSETFLG   = 93,  //! set_chunk_flags()
+   LNLFUNCT  = 94,  //! newlines before function
+   LCHUNK    = 95,  //! Add or delete chunk
+   LBC       = 96,  //! brace cleanup
+   LCOMBINE  = 97,  //! combine
+   LGUY98    = 98,  //! for guy-test
+   LGUY      = 99,  //! for guy-test
+   LBR       = 100, //! braces
+   LOUTPUT   = 101, //! output
+   LUNC      = 102, //! rules used in uncrustify.cpp
+   LQT       = 103, //! load/save options for Qt
+   LOTHER    = 255, //! stuff that doesn't neatly fit any other category
+};
+
+#endif /* LOG_LEVELS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.cpp
new file mode 100644
index 00000000..0117ff20
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.cpp
@@ -0,0 +1,80 @@
+/**
+ * @file log_rules.cpp
+ * is an extract from space.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "log_rules.h"
+
+#include "unc_tools.h"
+
+
+void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second)
+{
+   LOG_FUNC_ENTRY();
+
+   if (second->type != CT_NEWLINE)
+   {
+      LOG_FMT(LSPACE, "%s(%zu): first->orig_line is %zu, first->orig_col is %zu, first->text() is '%s', [%s/%s] <===>\n",
+              func, line, first->orig_line, first->orig_col, first->text(),
+              get_token_name(first->type), get_token_name(get_chunk_parent_type(first)));
+      LOG_FMT(LSPACE, "           second->orig_line is %zu, second->orig_col is %zu, second->text() is '%s', [%s/%s] :",
+              second->orig_line, second->orig_col, second->text(),
+              get_token_name(second->type), get_token_name(get_chunk_parent_type(second)));
+      LOG_FMT(LSPACE, " rule %s[line %zu]\n",
+              rule, line);
+   }
+}
+
+
+#ifdef SUPER_LOG
+
+
+void log_rule3(log_sev_t sev, const char *func, size_t line, const char *rule)
+#else
+
+
+void log_rule3(log_sev_t sev, const char *func, const char *rule)
+#endif
+{
+   // some Windows platforms provide a qualified function name ("ABC::XYZ::function_Name")
+   // as __func__; call get_unqualified_func_name() to return an unqualified function name
+
+   func = get_unqualified_func_name(func);
+
+#ifdef SUPER_LOG
+   LOG_FMT(sev, "log_rule(%s:%zu): rule is '%s'\n", func, line, rule);
+#else
+   LOG_FMT(sev, "log_rule(%s): rule is '%s'\n", func, rule);
+#endif
+}
+
+
+void log_rule4(const char *rule, chunk_t *first)
+{
+   if (cpd.html_file == nullptr)
+   {
+      return;
+   }
+
+   if (first->tracking == nullptr)
+   {
+      first->tracking = new track_list;
+      first->tracking->reserve(3);
+   }
+   // copy the rule
+   size_t length = strlen(rule) + 1;
+   char   *r     = (char *)malloc(length);
+
+   strcpy(r, rule);
+   size_t   a_number = get_A_Number();
+   Track_nr A        = make_pair(a_number, r);
+
+   first->tracking->push_back(A);
+   size_t sizeOfTrack = first->tracking->size();
+
+   LOG_FMT(LSPACE, "log_rule4(%d): rule is '%s', after '%s'', at line %zu, tracking number is %zu, size is %zu\n",
+           __LINE__, rule, first->text(), first->orig_line, a_number, sizeOfTrack);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.h
new file mode 100644
index 00000000..9fd201cc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/log_rules.h
@@ -0,0 +1,63 @@
+/**
+ * @file log_rules.h
+ * prototypes for log_rules.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#ifndef LOG_RULES_H_INCLUDED
+#define LOG_RULES_H_INCLUDED
+
+#include "chunk_list.h"
+#include "uncrustify.h"
+
+using namespace uncrustify;
+
+#if defined DEBUG
+#define log_rule(rule)                                      \
+   do {                                                     \
+      log_rule2(__func__, __LINE__, (rule), first, second); \
+      log_rule4((rule), first);                             \
+                                                            \
+   } while (0)
+#else
+#define log_rule(rule)                                      \
+   do {                                                     \
+      log_rule2(__func__, __LINE__, (rule), first, second); \
+   } while (0)
+#endif
+
+#define log_rule_short(rule)                                \
+   do {                                                     \
+      log_rule2(__func__, __LINE__, (rule), first, second); \
+   } while (0)
+
+// if you need more debug informations, remove the comment at the next line
+#define SUPER_LOG    1
+#ifdef SUPER_LOG
+#define log_rule_B(rule)                               \
+   do {                                                \
+      log_rule3(LCURRENT, __func__, __LINE__, (rule)); \
+   } while (0)
+#else
+#define log_rule_B(rule)                     \
+   do {                                      \
+      log_rule3(LCURRENT, __func__, (rule)); \
+   } while (0)
+#endif
+
+void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second);
+
+
+#ifdef SUPER_LOG
+void log_rule3(log_sev_t sev, const char *func, size_t line, const char *rule);
+
+#else
+void log_rule3(log_sev_t sev, const char *func, const char *rule);
+
+#endif
+
+void log_rule4(const char *rule, chunk_t *first);
+
+#endif /* LOG_RULES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logger.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.cpp
index 36e97827..969a4192 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logger.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.cpp
@@ -10,16 +10,11 @@
  * @license GPL v2+
  */
 
-#include "compat.h"
-#include "log_levels.h"
 #include "logger.h"
-#include "unc_ctype.h"
-#include "uncrustify_types.h"
 
-#include <cstdio>
-#include <deque>
-#include <stdarg.h>
-#include <vector>
+#include "compat.h"
+
+#include <cstdarg>                   // to get va_start, va_end
 
 
 struct log_fcn_info
@@ -57,6 +52,8 @@ struct log_buf
    log_mask_t        mask;
    bool              show_hdr;  //! flag determine if a header gets added to log message
 };
+
+
 static struct log_buf g_log;
 
 
@@ -129,7 +126,8 @@ void log_flush(bool force_nl)
 {
    if (g_log.buf_len > 0)
    {
-      if (force_nl && g_log.bufX[g_log.buf_len - 1] != '\n')
+      if (  force_nl
+         && g_log.bufX[g_log.buf_len - 1] != '\n')
       {
          g_log.bufX[g_log.buf_len++] = '\n';
          g_log.bufX[g_log.buf_len]   = 0;
@@ -158,7 +156,8 @@ static size_t log_start(log_sev_t sev)
    }
 
    // If not in a log, the buffer is empty. Add the header, if enabled.
-   if (!g_log.in_log && g_log.show_hdr)
+   if (  !g_log.in_log
+      && g_log.show_hdr)
    {
       g_log.buf_len = static_cast<size_t>(snprintf(&g_log.bufX[0], g_log.bufX.size(), "<%d>", sev));
    }
@@ -182,7 +181,8 @@ static void log_end(void)
 
 void log_fmt(log_sev_t sev, const char *fmt, ...)
 {
-   if (fmt == nullptr || !log_sev_on(sev))
+   if (  fmt == nullptr
+      || !log_sev_on(sev))
    {
       return;
    }
@@ -194,7 +194,7 @@ void log_fmt(log_sev_t sev, const char *fmt, ...)
       return;
    }
    // the value of buffer_length is experimental
-   const int buffer_length = 4100;
+   const int buffer_length = 40000;
    char      buf[buffer_length];
 
    // it MUST be a 'unsigned int' variable to be runable under windows
@@ -309,3 +309,28 @@ void log_func_stack(log_sev_t sev, const char *prefix, const char *suffix, size_
       LOG_FMT(sev, "%s", suffix);
    }
 }
+
+
+const char *get_unqualified_func_name(const char *func)
+{
+   /**
+    * we look for the last ':' character;
+    */
+   for (auto i = strlen(func); i > 0; --i)
+   {
+      if (func[i - 1] == ':')
+      {
+         /**
+          * function name is qualified, so return the
+          * unqualified portion
+          */
+         return(func + i);
+      }
+   }
+
+   /**
+    * input function name is unqualified
+    */
+
+   return(func);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logger.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.h
index d1f21447..df63b276 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logger.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logger.h
@@ -16,8 +16,8 @@
 #define LOGGER_H_INCLUDED
 
 #include "logmask.h"
+
 #include <cstdio>      // FILE
-#include <cstring>     // strlen()
 
 
 /**
@@ -118,13 +118,16 @@ void log_flush(bool force_nl);
 #endif
 
 
+#define __unqualified_func__    get_unqualified_func_name(__func__)
+
+
 #ifdef DEBUG
 /**
  * This should be called as the first thing in a function.
  * It uses the log_func class to add an entry to the function log stack.
  * It is automatically removed when the function returns.
  */
-#define LOG_FUNC_ENTRY()    log_func log_fe = log_func(__func__, __LINE__)
+#define LOG_FUNC_ENTRY()    log_func log_fe = log_func(__unqualified_func__, __LINE__)
 
 
 #else
@@ -150,6 +153,14 @@ public:
 void log_func_stack(log_sev_t sev, const char *prefix = 0, const char *suffix = "\n", size_t skip_cnt = 0);
 
 
+/**
+ * Return the unqualified function name from the input argument
+ * @param  the qualified function name, usually provided by __func__ macro
+ * @return the corresponding unqualified name
+ */
+const char *get_unqualified_func_name(const char *func);
+
+
 #define log_func_stack_inline(_sev)    log_func_stack((_sev), " [CallStack:", "]\n", 0)
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logmask.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.cpp
index 704bc091..ca94cd05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logmask.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.cpp
@@ -26,7 +26,8 @@
  */
 char *logmask_to_str(const log_mask_t &mask, char *buf, int size)
 {
-   if (buf == nullptr || size <= 0)
+   if (  buf == nullptr
+      || size <= 0)
    {
       return(buf);
    }
@@ -61,7 +62,8 @@ char *logmask_to_str(const log_mask_t &mask, char *buf, int size)
    }
 
    // handle a range that ends on the last bit
-   if (is_range && last_sev != -1)
+   if (  is_range
+      && last_sev != -1)
    {
       buf[len - 1] = '-';  // change last comma to a dash
       len         += snprintf(&buf[len], size - len, "%d", last_sev);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logmask.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.h
index 7cc24ca4..7cc24ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/logmask.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/logmask.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/md5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.cpp
index 9162c309..af8874a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/md5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "md5.h"
+
 #include <string.h>
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/md5.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.h
index d1148b5e..d1148b5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/md5.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/md5.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/newlines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.cpp
index c1ed1340..c49bf32b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/newlines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.cpp
@@ -20,28 +20,20 @@
 #include "newlines.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
-#include "combine.h"
 #include "combine_skip.h"
 #include "flag_parens.h"
 #include "indent.h"
 #include "keywords.h"
-#include "language_tools.h"
-#include "log_rules.h"
-#include "options.h"
 #include "prototypes.h"
 #include "space.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <vector>
+#ifdef WIN32
+#include <algorithm>                   // to get max
+#endif // ifdef WIN32
 
 
+constexpr static auto LCURRENT = LNEWLINE;
+
 using namespace std;
 using namespace uncrustify;
 
@@ -315,6 +307,7 @@ static iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base,
 static void mark_change(const char *func, size_t line)
 {
    LOG_FUNC_ENTRY();
+
    cpd.changes++;
 
    if (cpd.pass_count == 0)
@@ -322,13 +315,15 @@ static void mark_change(const char *func, size_t line)
       LOG_FMT(LCHANGE, "%s(%d): change %d on %s:%zu\n",
               __func__, __LINE__, cpd.changes, func, line);
    }
-}
+} // mark_change
 
 
 static bool can_increase_nl(chunk_t *nl)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *prev = chunk_get_prev_nc(nl);
+
    chunk_t *pcmt = chunk_get_prev(nl);
    chunk_t *next = chunk_get_next(nl);
 
@@ -341,7 +336,8 @@ static bool can_increase_nl(chunk_t *nl)
       if (  pp_start != nullptr
          && (  get_chunk_parent_type(pp_start) == CT_PP_IF
             || get_chunk_parent_type(pp_start) == CT_PP_ELSE)
-         && (pp_start->level > 0 || options::nl_squeeze_ifdef_top_level()))
+         && (  pp_start->level > 0
+            || options::nl_squeeze_ifdef_top_level()))
       {
          log_rule_B("nl_squeeze_ifdef_top_level");
          bool rv = ifdef_over_whole_file() && pp_start->flags.test(PCF_WF_IF);
@@ -353,7 +349,8 @@ static bool can_increase_nl(chunk_t *nl)
       if (  chunk_is_token(next, CT_PREPROC)
          && (  get_chunk_parent_type(next) == CT_PP_ELSE
             || get_chunk_parent_type(next) == CT_PP_ENDIF)
-         && (next->level > 0 || options::nl_squeeze_ifdef_top_level()))
+         && (  next->level > 0
+            || options::nl_squeeze_ifdef_top_level()))
       {
          log_rule_B("nl_squeeze_ifdef_top_level");
          bool rv = ifdef_over_whole_file() && next->flags.test(PCF_WF_ENDIF);
@@ -365,7 +362,7 @@ static bool can_increase_nl(chunk_t *nl)
 
    if (chunk_is_token(next, CT_BRACE_CLOSE))
    {
-      if (  options::nl_inside_namespace()
+      if (  options::nl_inside_namespace() > 0
          && get_chunk_parent_type(next) == CT_NAMESPACE)
       {
          log_rule_B("nl_inside_namespace");
@@ -394,9 +391,21 @@ static bool can_increase_nl(chunk_t *nl)
       }
    }
 
+   if (chunk_is_token(prev, CT_BRACE_CLOSE))
+   {
+      if (  options::nl_before_namespace()
+         && get_chunk_parent_type(prev) == CT_NAMESPACE)
+      {
+         log_rule_B("nl_before_namespace");
+         LOG_FMT(LBLANKD, "%s(%d): nl_before_namespace %zu\n",
+                 __func__, __LINE__, nl->orig_line);
+         return(true);
+      }
+   }
+
    if (chunk_is_token(prev, CT_BRACE_OPEN))
    {
-      if (  options::nl_inside_namespace()
+      if (  options::nl_inside_namespace() > 0
          && get_chunk_parent_type(prev) == CT_NAMESPACE)
       {
          log_rule_B("nl_inside_namespace");
@@ -458,6 +467,7 @@ static void setup_newline_add(chunk_t *prev, chunk_t *nl, chunk_t *next)
 
    nl->orig_line   = prev->orig_line;
    nl->level       = prev->level;
+   nl->pp_level    = prev->pp_level;
    nl->brace_level = prev->brace_level;
    nl->pp_level    = prev->pp_level;
    nl->nl_count    = 1;
@@ -481,12 +491,13 @@ static void setup_newline_add(chunk_t *prev, chunk_t *nl, chunk_t *next)
       set_chunk_type(nl, CT_NEWLINE);
       nl->str = "\n";
    }
-}
+} // setup_newline_add
 
 
 void double_newline(chunk_t *nl)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *prev = chunk_get_prev(nl);
 
    if (prev == nullptr)
@@ -517,16 +528,15 @@ void double_newline(chunk_t *nl)
       nl->nl_count = 2;
       MARK_CHANGE();
    }
-}
+} // double_newline
 
 
 chunk_t *newline_add_before(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t nl;
-   chunk_t *prev;
 
-   prev = chunk_get_prev_nvb(pc);
+   chunk_t nl;
+   chunk_t *prev = chunk_get_prev_nvb(pc);
 
    if (chunk_is_newline(prev))
    {
@@ -539,26 +549,29 @@ chunk_t *newline_add_before(chunk_t *pc)
 
    setup_newline_add(prev, &nl, pc);
    nl.orig_col = pc->orig_col;
+   nl.pp_level = pc->pp_level;
    LOG_FMT(LNEWLINE, "%s(%d): nl.column is %zu\n",
            __func__, __LINE__, nl.column);
 
    MARK_CHANGE();
    return(chunk_add_before(&nl, pc));
-}
+} // newline_add_before
 
 
 chunk_t *newline_force_before(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *nl = newline_add_before(pc);
 
-   if (nl != nullptr && nl->nl_count > 1)
+   if (  nl != nullptr
+      && nl->nl_count > 1)
    {
       nl->nl_count = 1;
       MARK_CHANGE();
    }
    return(nl);
-}
+} // newline_force_before
 
 
 chunk_t *newline_add_after(chunk_t *pc)
@@ -589,13 +602,15 @@ chunk_t *newline_add_after(chunk_t *pc)
    MARK_CHANGE();
    // TO DO: check why the next statement is necessary
    nl.orig_col = pc->orig_col;
+   nl.pp_level = pc->pp_level;
    return(chunk_add_after(&nl, pc));
-}
+} // newline_add_after
 
 
 chunk_t *newline_force_after(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *nl = newline_add_after(pc);   // add a newline
 
    if (  nl != nullptr
@@ -605,12 +620,13 @@ chunk_t *newline_force_after(chunk_t *pc)
       MARK_CHANGE();
    }
    return(nl);
-}
+} // newline_force_after
 
 
 static void newline_end_newline(chunk_t *br_close)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *next = chunk_get_next(br_close);
    chunk_t nl;
 
@@ -620,6 +636,7 @@ static void newline_end_newline(chunk_t *br_close)
       nl.orig_line = br_close->orig_line;
       nl.orig_col  = br_close->orig_col;
       nl.nl_count  = 1;
+      nl.pp_level  = 0;
       nl.flags     = (br_close->flags & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC;
 
       if (  br_close->flags.test(PCF_IN_PREPROC)
@@ -644,7 +661,7 @@ static void newline_end_newline(chunk_t *br_close)
               __func__, __LINE__, br_close->orig_line, br_close->orig_col, br_close->text());
       chunk_add_after(&nl, br_close);
    }
-}
+} // newline_end_newline
 
 
 static void newline_min_after(chunk_t *ref, size_t count, pcf_flag_e flag)
@@ -747,7 +764,7 @@ chunk_t *newline_add_between(chunk_t *start, chunk_t *end)
          if (chunk_is_newline(pc))
          {
             // are there some more (comment + newline)s ?
-            chunk_t *pc1 = chunk_get_next_ncnl(end);
+            chunk_t *pc1 = chunk_get_next_ncnnl(end);
 
             if (!chunk_is_newline(pc1))
             {
@@ -814,7 +831,8 @@ void newline_del_between(chunk_t *start, chunk_t *end)
       {
          chunk_t *prev = chunk_get_prev(pc);
 
-         if (  (!chunk_is_comment(prev) && !chunk_is_comment(next))
+         if (  (  !chunk_is_comment(prev)
+               && !chunk_is_comment(next))
             || chunk_is_newline(prev)
             || chunk_is_newline(next))
          {
@@ -860,9 +878,9 @@ void newlines_sparens()
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *sparen_open;
+   //chunk_t *sparen_open;
 
-   for (sparen_open = chunk_get_next_type(chunk_get_head(), CT_SPAREN_OPEN, ANY_LEVEL);
+   for (chunk_t *sparen_open = chunk_get_next_type(chunk_get_head(), CT_SPAREN_OPEN, ANY_LEVEL);
         sparen_open != nullptr; sparen_open = chunk_get_next_type(
            sparen_open, CT_SPAREN_OPEN, ANY_LEVEL))
    {
@@ -888,7 +906,8 @@ void newlines_sparens()
       }
 
       // Add a newline before ')' if an if/for/while/switch condition spans multiple lines. Overrides nl_before_if_closing_paren if both are specified.
-      if (is_multiline && options::nl_multi_line_sparen_close() != IARF_IGNORE)
+      if (  is_multiline
+         && options::nl_multi_line_sparen_close() != IARF_IGNORE)
       {
          log_rule_B("nl_multi_line_sparen_close");
          newline_iarf(sparen_content_end, options::nl_multi_line_sparen_close());
@@ -896,7 +915,7 @@ void newlines_sparens()
       else
       {
          // add/remove trailing newline in an if condition
-         chunk_t *ctrl_structure = chunk_get_prev_ncnl(sparen_open);
+         chunk_t *ctrl_structure = chunk_get_prev_ncnnl(sparen_open);
 
          if (  chunk_is_token(ctrl_structure, CT_IF)
             || chunk_is_token(ctrl_structure, CT_ELSEIF))
@@ -922,12 +941,12 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
       return(false);
    }
    bool    retval = false;
-   chunk_t *pc    = chunk_get_next_ncnl(start);
+   chunk_t *pc    = chunk_get_next_ncnnl(start);
 
    if (chunk_is_token(pc, CT_SPAREN_OPEN))
    {
       chunk_t *close_paren = chunk_get_next_type(pc, CT_SPAREN_CLOSE, pc->level);
-      chunk_t *brace_open  = chunk_get_next_ncnl(close_paren);
+      chunk_t *brace_open  = chunk_get_next_ncnnl(close_paren);
 
       if (  (  chunk_is_token(brace_open, CT_BRACE_OPEN)
             || chunk_is_token(brace_open, CT_VBRACE_OPEN))
@@ -952,7 +971,7 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
             // Can only add - we don't want to create a one-line here
             if (nl_opt & IARF_ADD)
             {
-               newline_iarf_pair(close_paren, chunk_get_next_ncnl(brace_open), nl_opt);
+               newline_iarf_pair(close_paren, chunk_get_next_ncnnl(brace_open), nl_opt);
                pc = chunk_get_next_type(brace_open, CT_VBRACE_CLOSE, brace_open->level);
 
                if (  !chunk_is_newline(chunk_get_prev_nc(pc))
@@ -966,9 +985,12 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
          else
          {
             newline_iarf_pair(close_paren, brace_open, nl_opt);
+            chunk_t *next = chunk_get_next_ncnnl(brace_open);
 
-            newline_add_between(brace_open, chunk_get_next_ncnl(brace_open));
-
+            if (brace_open->type != next->type)                       // Issue #2836
+            {
+               newline_add_between(brace_open, chunk_get_next_ncnnl(brace_open));
+            }
             // Make sure nothing is cuddled with the closing brace
             pc = chunk_get_next_type(brace_open, CT_BRACE_CLOSE, brace_open->level);
             newline_add_between(pc, chunk_get_next_nblank(pc));
@@ -995,11 +1017,6 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
    {
       return;
    }
-   chunk_t *prev;
-   chunk_t *next;
-   chunk_t *last_nl = nullptr;
-   size_t  level    = start->level;
-   bool    do_add   = (nl_opt & IARF_ADD) != IARF_IGNORE; // forcing value to bool
 
    /*
     * look backwards until we find
@@ -1009,15 +1026,21 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
     */
    for (chunk_t *pc = chunk_get_prev(start); pc != nullptr; pc = chunk_get_prev(pc))
    {
+      size_t  level    = start->level;
+      bool    do_add   = (nl_opt & IARF_ADD) != IARF_IGNORE; // forcing value to bool
+      chunk_t *last_nl = nullptr;
+
       if (chunk_is_newline(pc))
       {
          last_nl = pc;
 
          // if we found 2 or more in a row
-         if (pc->nl_count > 1 || chunk_is_newline(chunk_get_prev_nvb(pc)))
+         if (  pc->nl_count > 1
+            || chunk_is_newline(chunk_get_prev_nvb(pc)))
          {
             // need to remove
-            if ((nl_opt & IARF_REMOVE) && !pc->flags.test(PCF_VAR_DEF))
+            if (  (nl_opt & IARF_REMOVE)
+               && !pc->flags.test(PCF_VAR_DEF))
             {
                // if we're also adding, take care of that here
                size_t nl_count = do_add ? 2 : 1;
@@ -1027,6 +1050,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
                   pc->nl_count = nl_count;
                   MARK_CHANGE();
                }
+               chunk_t *prev;
 
                // can keep using pc because anything other than newline stops loop, and we delete if newline
                while (chunk_is_newline(prev = chunk_get_prev_nvb(pc)))
@@ -1043,7 +1067,8 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
             return;
          }
       }
-      else if (chunk_is_opening_brace(pc) || pc->level < level)
+      else if (  chunk_is_opening_brace(pc)
+              || pc->level < level)
       {
          return;
       }
@@ -1067,6 +1092,8 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
             }
             else
             {
+               chunk_t *next;
+
                // we didn't run into a newline, so we need to add one
                if (  ((next = chunk_get_next(pc)) != nullptr)
                   && chunk_is_comment(next))
@@ -1094,16 +1121,17 @@ static void blank_line_set(chunk_t *pc, Option<unsigned> &opt)
    {
       return;
    }
-   const auto optval = opt();
+   const unsigned optval = opt();
 
-   if ((optval > 0) && (pc->nl_count != optval))
+   if (  (optval > 0)
+      && (pc->nl_count != optval))
    {
       LOG_FMT(LBLANKD, "%s(%d): do_blank_lines: %s set line %zu to %u\n",
               __func__, __LINE__, opt.name(), pc->orig_line, optval);
       pc->nl_count = optval;
       MARK_CHANGE();
    }
-}
+} // blank_line_set
 
 
 bool do_it_newlines_func_pre_blank_lines(chunk_t *last_nl, c_token_t start_type)
@@ -1305,14 +1333,16 @@ static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
               || chunk_is_token(pc, CT_BYREF)                  // Issue #2163
               || chunk_is_token(pc, CT_DC_MEMBER)
               || chunk_is_token(pc, CT_EXTERN)
-              || (chunk_is_token(pc, CT_STRING) && get_chunk_parent_type(pc) == CT_EXTERN))
+              || (  chunk_is_token(pc, CT_STRING)
+                 && get_chunk_parent_type(pc) == CT_EXTERN))
       {
          LOG_FMT(LNLFUNCT, "%s(%d): first_line set to %zu\n",
                  __func__, __LINE__, pc->orig_line);
          first_line = pc->orig_line;
          continue;
       }
-      else if (chunk_is_token(pc, CT_ANGLE_CLOSE) && get_chunk_parent_type(pc) == CT_TEMPLATE)
+      else if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
+              && get_chunk_parent_type(pc) == CT_TEMPLATE)
       {
          LOG_FMT(LNLFUNCT, "%s(%d):\n", __func__, __LINE__);
          // skip template stuff to add newlines before it
@@ -1340,36 +1370,41 @@ static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
 static chunk_t *get_closing_brace(chunk_t *start)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *pc;
    size_t  level = start->level;
 
    for (pc = start; (pc = chunk_get_next(pc)) != nullptr;)
    {
-      if (  (chunk_is_token(pc, CT_BRACE_CLOSE) || chunk_is_token(pc, CT_VBRACE_CLOSE))
+      if (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
+            || chunk_is_token(pc, CT_VBRACE_CLOSE))
          && pc->level == level)
       {
          return(pc);
       }
 
       // for some reason, we can have newlines between if and opening brace that are lower level than either
-      if (!chunk_is_newline(pc) && pc->level < level)
+      if (  !chunk_is_newline(pc)
+         && pc->level < level)
       {
          return(nullptr);
       }
    }
 
    return(nullptr);
-}
+} // get_closing_brace
 
 
 static void remove_next_newlines(chunk_t *start)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *next;
 
    while ((next = chunk_get_next(start)) != nullptr)
    {
-      if (chunk_is_newline(next) && chunk_safe_to_del_nl(next))
+      if (  chunk_is_newline(next)
+         && chunk_safe_to_del_nl(next))
       {
          chunk_del(next);
          MARK_CHANGE();
@@ -1383,14 +1418,13 @@ static void remove_next_newlines(chunk_t *start)
          break;
       }
    }
-}
+} // remove_next_newlines
 
 
 static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e nl_opt)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc;
-   chunk_t *next;
+
    chunk_t *prev;
 
    LOG_FMT(LNEWLINE, "%s(%d): start->text() is '%s', type is %s, orig_line is %zu, orig_column is %zu\n",
@@ -1404,9 +1438,10 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
    {
       return;
    }
+   chunk_t *pc = get_closing_brace(start);
 
    // first find ending brace
-   if ((pc = get_closing_brace(start)) == nullptr)
+   if (pc == nullptr)
    {
       return;
    }
@@ -1419,12 +1454,15 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
     */
    if (chunk_is_token(start, CT_IF))
    {
+      chunk_t *next;
+
       while (true)
       {
-         next = chunk_get_next_ncnl(pc);
+         next = chunk_get_next_ncnnl(pc);
 
          if (  next != nullptr
-            && (chunk_is_token(next, CT_ELSE) || chunk_is_token(next, CT_ELSEIF)))
+            && (  chunk_is_token(next, CT_ELSE)
+               || chunk_is_token(next, CT_ELSEIF)))
          {
             // point to the closing brace of the else
             if ((pc = get_closing_brace(next)) == nullptr)
@@ -1483,6 +1521,8 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
 
    if (nl_opt & IARF_REMOVE)
    {
+      chunk_t *next;
+
       // if chunk before is a vbrace, remove any newlines after it
       if (have_pre_vbrace_nl)
       {
@@ -1510,6 +1550,7 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
    // don't do anything with it if the next non newline chunk is a closing brace
    if (nl_opt & IARF_ADD)
    {
+      chunk_t *next;
       chunk_t *nextNNL = chunk_get_next_nnl(pc);
 
       do
@@ -1626,7 +1667,6 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
 static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trailing)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc;
 
    log_rule_B("nl_define_macro");
 
@@ -1640,11 +1680,11 @@ static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trai
     * step past any junk between the keyword and the open brace
     * Quit if we hit a semicolon or '=', which are not expected.
     */
-   size_t level = start->level;
-
-   pc = start;
+   size_t  level = start->level;
+   chunk_t *pc   = start;
 
-   while (((pc = chunk_get_next_ncnl(pc)) != nullptr) && pc->level >= level)
+   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+         && pc->level >= level)
    {
       if (  pc->level == level
          && (  chunk_is_token(pc, CT_BRACE_OPEN)
@@ -1689,50 +1729,44 @@ static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trai
 static void newlines_enum(chunk_t *start)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc;
-   chunk_t *pcClass;
-   chunk_t *pcType;
-   chunk_t *pcColon;
-   chunk_t *pcType1;
-   chunk_t *pcType2;
-   iarf_e  nl_opt;
 
    log_rule_B("nl_define_macro");
 
-   if (start->flags.test(PCF_IN_PREPROC) && !options::nl_define_macro())
+   if (  start->flags.test(PCF_IN_PREPROC)
+      && !options::nl_define_macro())
    {
       return;
    }
    // look for 'enum class'
-   pcClass = chunk_get_next_ncnl(start);
+   chunk_t *pcClass = chunk_get_next_ncnnl(start);
 
    if (chunk_is_token(pcClass, CT_ENUM_CLASS))
    {
       log_rule_B("nl_enum_class");
       newline_iarf_pair(start, pcClass, options::nl_enum_class());
       // look for 'identifier'/ 'type'
-      pcType = chunk_get_next_ncnl(pcClass);
+      chunk_t *pcType = chunk_get_next_ncnnl(pcClass);
 
       if (chunk_is_token(pcType, CT_TYPE))
       {
          log_rule_B("nl_enum_class_identifier");
          newline_iarf_pair(pcClass, pcType, options::nl_enum_class_identifier());
          // look for ':'
-         pcColon = chunk_get_next_ncnl(pcType);
+         chunk_t *pcColon = chunk_get_next_ncnnl(pcType);
 
          if (chunk_is_token(pcColon, CT_BIT_COLON))
          {
             log_rule_B("nl_enum_identifier_colon");
             newline_iarf_pair(pcType, pcColon, options::nl_enum_identifier_colon());
             // look for 'type' i.e. unsigned
-            pcType1 = chunk_get_next_ncnl(pcColon);
+            chunk_t *pcType1 = chunk_get_next_ncnnl(pcColon);
 
             if (chunk_is_token(pcType1, CT_TYPE))
             {
                log_rule_B("nl_enum_colon_type");
                newline_iarf_pair(pcColon, pcType1, options::nl_enum_colon_type());
                // look for 'type' i.e. int
-               pcType2 = chunk_get_next_ncnl(pcType1);
+               chunk_t *pcType2 = chunk_get_next_ncnnl(pcType1);
 
                if (chunk_is_token(pcType2, CT_TYPE))
                {
@@ -1747,11 +1781,11 @@ static void newlines_enum(chunk_t *start)
     * step past any junk between the keyword and the open brace
     * Quit if we hit a semicolon or '=', which are not expected.
     */
-   size_t level = start->level;
-
-   pc = start;
+   size_t  level = start->level;
+   chunk_t *pc   = start;
 
-   while (((pc = chunk_get_next_ncnl(pc)) != nullptr) && pc->level >= level)
+   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+         && pc->level >= level)
    {
       if (  pc->level == level
          && (  chunk_is_token(pc, CT_BRACE_OPEN)
@@ -1773,8 +1807,10 @@ static void newlines_enum(chunk_t *start)
       {
          next = chunk_get_next(next);
       }
+      iarf_e nl_opt;
 
-      if (!chunk_is_comment(next) && !chunk_is_newline(next))
+      if (  !chunk_is_comment(next)
+         && !chunk_is_newline(next))
       {
          nl_opt = IARF_IGNORE;
       }
@@ -1794,12 +1830,12 @@ static void newlines_enum(chunk_t *start)
 static void newlines_namespace(chunk_t *start)
 {
    LOG_FUNC_ENTRY();
+
    log_rule_B("nl_namespace_brace");
-   iarf_e nl_opt = options::nl_namespace_brace();
 
    // Add or remove newline between 'namespace' and 'BRACE_OPEN'
-
    log_rule_B("nl_define_macro");
+   iarf_e nl_opt = options::nl_namespace_brace();
 
    if (  nl_opt == IARF_IGNORE
       || (  start->flags.test(PCF_IN_PREPROC)
@@ -1811,7 +1847,8 @@ static void newlines_namespace(chunk_t *start)
 
    LOG_FMT(LNEWLINE, "%s(%d): braceOpen->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
            __func__, __LINE__, braceOpen->orig_line, braceOpen->orig_col, braceOpen->text());
-   log_pcf_flags(LNEWLINE, braceOpen->flags);
+   // produces much more log output. Use it only debugging purpose
+   //log_pcf_flags(LNEWLINE, braceOpen->flags);
 
    if (braceOpen->flags.test(PCF_ONE_LINER))
    {
@@ -1831,7 +1868,6 @@ static void newlines_namespace(chunk_t *start)
 static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *br_close;
 
    log_rule_B("nl_define_macro");
 
@@ -1840,19 +1876,18 @@ static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt)
    {
       return;
    }
-   br_close = chunk_get_prev_ncnlni(start);   // Issue #2279
+   chunk_t *br_close = chunk_get_prev_ncnnlni(start);   // Issue #2279
 
    if (chunk_is_token(br_close, CT_BRACE_CLOSE))
    {
       newline_iarf_pair(br_close, start, nl_opt);
    }
-}
+} // newlines_cuddle_uncuddle
 
 
 static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *next;
 
    log_rule_B("nl_define_macro");
 
@@ -1862,10 +1897,11 @@ static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
    {
       return;
    }
-   next = chunk_get_next_ncnl(start);
+   chunk_t *next = chunk_get_next_ncnnl(start);
 
    if (  next != nullptr
-      && (chunk_is_token(next, CT_BRACE_OPEN) || chunk_is_token(next, CT_VBRACE_OPEN)))
+      && (  chunk_is_token(next, CT_BRACE_OPEN)
+         || chunk_is_token(next, CT_VBRACE_OPEN)))
    {
       if (!one_liner_nl_ok(next))
       {
@@ -1879,7 +1915,7 @@ static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
          // Can only add - we don't want to create a one-line here
          if (nl_opt & IARF_ADD)
          {
-            newline_iarf_pair(start, chunk_get_next_ncnl(next), nl_opt);
+            newline_iarf_pair(start, chunk_get_next_ncnnl(next), nl_opt);
             chunk_t *tmp = chunk_get_next_type(next, CT_VBRACE_CLOSE, next->level);
 
             if (  !chunk_is_newline(chunk_get_next_nc(tmp))
@@ -1892,8 +1928,7 @@ static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
       else
       {
          newline_iarf_pair(start, next, nl_opt);
-
-         newline_add_between(next, chunk_get_next_ncnl(next));
+         newline_add_between(next, chunk_get_next_ncnnl(next));
       }
    }
 } // newlines_do_else
@@ -1901,11 +1936,12 @@ static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
 
 static bool is_var_def(chunk_t *pc, chunk_t *next)
 {
-   if (chunk_is_token(pc, CT_DECLTYPE) && chunk_is_token(next, CT_PAREN_OPEN))
+   if (  chunk_is_token(pc, CT_DECLTYPE)
+      && chunk_is_token(next, CT_PAREN_OPEN))
    {
       // If current token starts a decltype expression, skip it
       next = chunk_skip_to_match(next);
-      next = chunk_get_next_ncnl(next);
+      next = chunk_get_next_ncnnl(next);
    }
    else if (!chunk_is_type(pc))
    {
@@ -1921,7 +1957,7 @@ static bool is_var_def(chunk_t *pc, chunk_t *next)
    {
       // If we have a template type, skip it
       next = chunk_skip_to_match(next);
-      next = chunk_get_next_ncnl(next);
+      next = chunk_get_next_ncnnl(next);
    }
    bool is = (  (  chunk_is_type(next)
                 && get_chunk_parent_type(next) != CT_FUNC_DEF)           // Issue #2639
@@ -1936,22 +1972,23 @@ static bool is_var_def(chunk_t *pc, chunk_t *next)
 static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
 {
    LOG_FUNC_ENTRY();
-   bool    did_this_line = false;
-   bool    first_var_blk = true;
-   bool    var_blk       = false;
 
-   chunk_t *prev = chunk_get_prev_ncnlni(start);   // Issue #2279
+   chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
 
    // can't be any variable definitions in a "= {" block
    if (chunk_is_token(prev, CT_ASSIGN))
    {
       chunk_t *tmp = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
-      return(chunk_get_next_ncnl(tmp));
+      return(chunk_get_next_ncnnl(tmp));
    }
-   chunk_t *pc = chunk_get_next(start);
+   chunk_t *pc           = chunk_get_next(start);
+   bool    did_this_line = false;
+   bool    first_var_blk = true;
+   bool    var_blk       = false;
 
    while (  pc != nullptr
-         && (pc->level >= start->level || pc->level == 0))
+         && (  pc->level >= start->level
+            || pc->level == 0))
    {
       LOG_FMT(LNL1LINE, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, text() is '%s'\n",
               __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
@@ -2019,13 +2056,15 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
       if (  !did_this_line
          && chunk_is_not_token(pc, CT_FUNC_CLASS_DEF)
          && chunk_is_not_token(pc, CT_FUNC_CLASS_PROTO)
-         && ((pc->level == (start->level + 1)) || pc->level == 0))
+         && (  (pc->level == (start->level + 1))
+            || pc->level == 0))
       {
-         chunk_t *next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
-         if (chunk_is_token(next, CT_PTR_TYPE))               // Issue #2692
+         if (  chunk_is_token(next, CT_PTR_TYPE) // Issue #2692
+            || chunk_is_token(next, CT_BYREF))   // Issue #3018
          {
-            next = chunk_get_next_ncnl(next);
+            next = chunk_get_next_ncnnl(next);
          }
 
          if (next == nullptr)
@@ -2045,7 +2084,7 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
             && get_chunk_parent_type(prev) == CT_EXTERN
             && chunk_is_token(prev->prev, CT_EXTERN))
          {
-            prev = chunk_get_prev_ncnlni(prev->prev);   // Issue #2279
+            prev = chunk_get_prev_ncnnlni(prev->prev);   // Issue #2279
          }
 
          if (is_var_def(pc, next))
@@ -2059,10 +2098,26 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
                && first_var_blk
                && options::nl_var_def_blk_start() > 0)
             {
-               newline_min_after(prev, options::nl_var_def_blk_start(), PCF_VAR_DEF);
+               chunk_t *prev_2 = chunk_get_prev_nnl(pc);                  // Issue #3097
+
+               // std::mutex* a;                                             Issue #2692
+               while (  chunk_is_token(prev_2, CT_DC_MEMBER)
+                     || chunk_is_token(prev_2, CT_TYPE))
+               {
+                  prev_2 = chunk_get_prev(prev_2);
+               }
+
+               if (chunk_is_token(prev_2, CT_NEWLINE))
+               {
+                  prev_2 = chunk_get_prev_nnl(prev_2);
+               }
+               LOG_FMT(LBLANKD, "%s(%d): prev_2 is '%s', orig_line is %zu\n",
+                       __func__, __LINE__, prev_2->text(), prev_2->orig_line);
+               newline_min_after(prev_2, options::nl_var_def_blk_start(), PCF_VAR_DEF);
             }
             // set newlines within var def block
-            else if (var_blk && (options::nl_var_def_blk_in() > 0))
+            else if (  var_blk
+                    && (options::nl_var_def_blk_in() > 0))
             {
                log_rule_B("nl_var_def_blk_in");
                prev = chunk_get_prev(pc);
@@ -2159,7 +2214,7 @@ static bool collapse_empty_body(chunk_t *br_open)
    }
 
    return(true);
-}
+} // collapse_empty_body
 
 
 static void newlines_brace_pair(chunk_t *br_open)
@@ -2168,7 +2223,8 @@ static void newlines_brace_pair(chunk_t *br_open)
 
    log_rule_B("nl_define_macro");
 
-   if (br_open->flags.test(PCF_IN_PREPROC) && !options::nl_define_macro())
+   if (  br_open->flags.test(PCF_IN_PREPROC)
+      && !options::nl_define_macro())
    {
       return;
    }
@@ -2208,11 +2264,11 @@ static void newlines_brace_pair(chunk_t *br_open)
       && !br_open->flags.test(PCF_NOT_POSSIBLE))          // Issue #2795
    {
       chunk_t *br_close = chunk_skip_to_match(br_open, scope_e::ALL);
-      chunk_t *tmp      = chunk_get_prev_ncnlni(br_open); // Issue #2279
+      chunk_t *tmp      = chunk_get_prev_ncnnlni(br_open); // Issue #2279
 
-      if (  br_close != nullptr                           // Issue #2594
+      if (  br_close != nullptr                            // Issue #2594
          && ((br_close->orig_line - br_open->orig_line) <= 2)
-         && chunk_is_paren_close(tmp))                    // need to check the conditions.
+         && chunk_is_paren_close(tmp))                     // need to check the conditions.
       {
          // Issue #1825
          bool is_it_possible = true;
@@ -2243,7 +2299,7 @@ static void newlines_brace_pair(chunk_t *br_open)
             if (options::code_width() > 0)
             {
                saved_chunk.reserve(16);
-               chunk_t *current       = chunk_get_prev_ncnlni(br_open);
+               chunk_t *current       = chunk_get_prev_ncnnlni(br_open);
                chunk_t *next_br_close = chunk_get_next(br_close);
                current = chunk_get_next(current);
 
@@ -2262,20 +2318,20 @@ static void newlines_brace_pair(chunk_t *br_open)
                   current = the_next;
                }
             }
-            tmp = chunk_get_prev_ncnlni(br_open);
+            chunk_t *tmp_1 = chunk_get_prev_ncnnlni(br_open);
 
-            while (  tmp != nullptr
-                  && (tmp = chunk_get_next(tmp)) != nullptr
-                  && !chunk_is_closing_brace(tmp)
-                  && (chunk_get_next(tmp) != nullptr))
+            while (  tmp_1 != nullptr
+                  && (tmp_1 = chunk_get_next(tmp_1)) != nullptr
+                  && !chunk_is_closing_brace(tmp_1)
+                  && (chunk_get_next(tmp_1) != nullptr))
             {
-               LOG_FMT(LNL1LINE, "%s(%d): tmp->orig_line is %zu, tmp->orig_col is %zu, text() is '%s'\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
+               LOG_FMT(LNL1LINE, "%s(%d): tmp_1->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
+                       __func__, __LINE__, tmp_1->orig_line, tmp_1->orig_col, tmp_1->text());
 
-               if (chunk_is_newline(tmp))
+               if (chunk_is_newline(tmp_1))
                {
-                  tmp = chunk_get_prev(tmp);                 // Issue #1825
-                  newline_iarf_pair(tmp, chunk_get_next_ncnl(tmp), IARF_REMOVE);
+                  tmp_1 = chunk_get_prev(tmp_1);                 // Issue #1825
+                  newline_iarf_pair(tmp_1, chunk_get_next_ncnnl(tmp_1), IARF_REMOVE);
                }
             }
             chunk_flags_set(br_open, PCF_ONE_LINER);         // set the one liner flag if needed
@@ -2305,6 +2361,7 @@ static void newlines_brace_pair(chunk_t *br_open)
                      set_chunk_type(&chunk, CT_NEWLINE);
                      chunk.orig_line = current->orig_line;
                      chunk.orig_col  = current->orig_col;
+                     chunk.pp_level  = current->pp_level;
                      chunk.nl_count  = 1;
                      chunk_add_before(&chunk, current);
                      LOG_FMT(LNEWLINE, "%s(%d): %zu:%zu add newline before '%s'\n",
@@ -2341,7 +2398,7 @@ static void newlines_brace_pair(chunk_t *br_open)
       // Only mess with it if the open brace is followed by a newline
       if (chunk_is_newline(next))
       {
-         chunk_t *prev = chunk_get_prev_ncnlni(br_open);   // Issue #2279
+         chunk_t *prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
          log_rule_B("nl_assign_brace");
          newline_iarf_pair(prev, br_open, options::nl_assign_brace());
       }
@@ -2370,13 +2427,13 @@ static void newlines_brace_pair(chunk_t *br_open)
             || get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
             || get_chunk_parent_type(br_open) == CT_OC_CLASS)
          {
-            val = iarf_e::NOT_DEFINED;
+            val = IARF_NOT_DEFINED;
             log_rule_B("nl_fdef_brace_cond");
             const iarf_e nl_fdef_brace_cond_v = options::nl_fdef_brace_cond();
 
             if (nl_fdef_brace_cond_v != IARF_IGNORE)
             {
-               prev = chunk_get_prev_ncnlni(br_open);   // Issue #2279
+               prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
 
                if (chunk_is_token(prev, CT_FPAREN_CLOSE))
                {
@@ -2384,7 +2441,7 @@ static void newlines_brace_pair(chunk_t *br_open)
                }
             }
 
-            if (val == iarf_e::NOT_DEFINED)
+            if (val == IARF_NOT_DEFINED)
             {
                log_rule_B("nl_fdef_brace");
                val = options::nl_fdef_brace();
@@ -2408,7 +2465,7 @@ static void newlines_brace_pair(chunk_t *br_open)
          if (prev == nullptr)
          {
             // Grab the chunk before the open brace
-            prev = chunk_get_prev_ncnlni(br_open);   // Issue #2279
+            prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
          }
          newline_iarf_pair(prev, br_open, val);
       }
@@ -2446,9 +2503,18 @@ static void newlines_brace_pair(chunk_t *br_open)
    {
       if (chunk_is_newline(next))
       {
+         log_rule_B("nl_inside_empty_func");
          log_rule_B("nl_inside_namespace");
 
-         if (options::nl_inside_namespace() && get_chunk_parent_type(br_open) == CT_NAMESPACE)
+         if (  options::nl_inside_empty_func() > 0
+            && chunk_is_token(chunk_get_next_nnl(br_open), CT_BRACE_CLOSE)
+            && (  get_chunk_parent_type(br_open) == CT_FUNC_CLASS_DEF
+               || get_chunk_parent_type(br_open) == CT_FUNC_DEF))
+         {
+            blank_line_set(next, options::nl_inside_empty_func);
+         }
+         else if (  options::nl_inside_namespace() > 0
+                 && get_chunk_parent_type(br_open) == CT_NAMESPACE)
          {
             blank_line_set(next, options::nl_inside_namespace);
          }
@@ -2479,21 +2545,20 @@ static void newlines_brace_pair(chunk_t *br_open)
          nl_close_brace = true;
       }
       // handle newlines after the open brace
-      chunk_t *pc = chunk_get_next_ncnl(br_open);
+      chunk_t *pc = chunk_get_next_ncnnl(br_open);
       newline_add_between(br_open, pc);
 
       newline_def_blk(br_open, true);
    }
 
    // Handle the cases where the brace is part of a class or struct
-   if (get_chunk_parent_type(br_open) == CT_CLASS || get_chunk_parent_type(br_open) == CT_STRUCT)
+   if (  get_chunk_parent_type(br_open) == CT_CLASS
+      || get_chunk_parent_type(br_open) == CT_STRUCT)
    {
       newline_def_blk(br_open, false);
    }
    // Grab the matching brace close
-   chunk_t *br_close;
-
-   br_close = chunk_get_next_type(br_open, CT_BRACE_CLOSE, br_open->level);
+   chunk_t *br_close = chunk_get_next_type(br_open, CT_BRACE_CLOSE, br_open->level);
 
    if (br_close == nullptr)
    {
@@ -2514,7 +2579,8 @@ static void newlines_brace_pair(chunk_t *br_open)
          pc = chunk_get_next(pc);
       }
 
-      if (chunk_is_newline(pc) || chunk_is_comment(pc))
+      if (  chunk_is_newline(pc)
+         || chunk_is_comment(pc))
       {
          nl_close_brace = true;
       }
@@ -2570,9 +2636,11 @@ static void newline_case(chunk_t *start)
    }
 
    // Only add an extra line after a semicolon or brace close
-   if (chunk_is_token(prev, CT_SEMICOLON) || chunk_is_token(prev, CT_BRACE_CLOSE))
+   if (  chunk_is_token(prev, CT_SEMICOLON)
+      || chunk_is_token(prev, CT_BRACE_CLOSE))
    {
-      if (chunk_is_newline(pc) && pc->nl_count < 2)
+      if (  chunk_is_newline(pc)
+         && pc->nl_count < 2)
       {
          double_newline(pc);
       }
@@ -2592,11 +2660,12 @@ static void newline_case_colon(chunk_t *start)
       pc = chunk_get_next(pc);
    } while (chunk_is_comment(pc));
 
-   if (pc != nullptr && !chunk_is_newline(pc))
+   if (  pc != nullptr
+      && !chunk_is_newline(pc))
    {
       newline_add_before(pc);
    }
-}
+} // newline_case_colon
 
 
 static void newline_before_return(chunk_t *start)
@@ -2688,12 +2757,13 @@ static void newline_after_return(chunk_t *start)
          return;
       }
    }
-}
+} // newline_after_return
 
 
 static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool check_nl_assign_leave_one_liners)
 {
    LOG_FUNC_ENTRY();
+
    LOG_FMT(LNEWLINE, "%s(%d): ", __func__, __LINE__);
    log_func_stack(LNEWLINE, "CallStack:");
 
@@ -2731,12 +2801,13 @@ static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool c
               __func__, __LINE__, before->text(), after->text());
       newline_del_between(before, after);
    }
-}
+} // newline_iarf_pair
 
 
 void newline_iarf(chunk_t *pc, iarf_e av)
 {
    LOG_FUNC_ENTRY();
+
    LOG_FMT(LNFD, "%s(%d): ", __func__, __LINE__);
    log_func_stack(LNFD, "CallStack:");
    chunk_t *after = chunk_get_next_nnl(pc);
@@ -2749,7 +2820,7 @@ void newline_iarf(chunk_t *pc, iarf_e av)
       return;
    }
    newline_iarf_pair(pc, after, av);
-}
+} // newline_iarf
 
 
 static void newline_func_multi_line(chunk_t *start)
@@ -2800,33 +2871,36 @@ static void newline_func_multi_line(chunk_t *start)
    {
       return;
    }
-   chunk_t *pc = chunk_get_next_ncnl(start);
+   chunk_t *pc = chunk_get_next_ncnnl(start);
 
-   while (pc != nullptr && pc->level > start->level)
+   while (  pc != nullptr
+         && pc->level > start->level)
    {
-      pc = chunk_get_next_ncnl(pc);
+      pc = chunk_get_next_ncnnl(pc);
    }
 
    if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
       && chunk_is_newline_between(start, pc))
    {
-      chunk_t *start_next         = chunk_get_next_ncnl(start);
+      chunk_t *start_next         = chunk_get_next_ncnnl(start);
       bool    has_leading_closure = (  start_next->parent_type == CT_OC_BLOCK_EXPR
                                     || start_next->parent_type == CT_CPP_LAMBDA
                                     || chunk_is_token(start_next, CT_BRACE_OPEN));
 
-      chunk_t *prev_end            = chunk_get_prev_ncnl(pc);
+      chunk_t *prev_end            = chunk_get_prev_ncnnl(pc);
       bool    has_trailing_closure = (  prev_end->parent_type == CT_OC_BLOCK_EXPR
                                      || prev_end->parent_type == CT_CPP_LAMBDA
                                      || chunk_is_token(prev_end, CT_BRACE_OPEN));
 
-      if (add_start && !chunk_is_newline(chunk_get_next(start)))
+      if (  add_start
+         && !chunk_is_newline(chunk_get_next(start)))
       {
          log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
          if (options::nl_func_call_args_multi_line_ignore_closures())
          {
-            if (!has_leading_closure && !has_trailing_closure)
+            if (  !has_leading_closure
+               && !has_trailing_closure)
             {
                newline_iarf(start, IARF_ADD);
             }
@@ -2837,13 +2911,15 @@ static void newline_func_multi_line(chunk_t *start)
          }
       }
 
-      if (add_end && !chunk_is_newline(chunk_get_prev(pc)))
+      if (  add_end
+         && !chunk_is_newline(chunk_get_prev(pc)))
       {
          log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
          if (options::nl_func_call_args_multi_line_ignore_closures())
          {
-            if (!has_leading_closure && !has_trailing_closure)
+            if (  !has_leading_closure
+               && !has_trailing_closure)
             {
                newline_iarf(chunk_get_prev(pc), IARF_ADD);
             }
@@ -2858,11 +2934,12 @@ static void newline_func_multi_line(chunk_t *start)
       {
          // process the function in reverse and leave the first comma if the option to leave trailing closure
          // is on. nl_func_call_args_multi_line_ignore_trailing_closure
-         for (pc = chunk_get_next_ncnl(start);
+         for (pc = chunk_get_next_ncnnl(start);
               pc != nullptr && pc->level > start->level;
-              pc = chunk_get_next_ncnl(pc))
+              pc = chunk_get_next_ncnnl(pc))
          {
-            if (chunk_is_token(pc, CT_COMMA) && (pc->level == (start->level + 1)))
+            if (  chunk_is_token(pc, CT_COMMA)
+               && (pc->level == (start->level + 1)))
             {
                chunk_t *tmp = chunk_get_next(pc);
 
@@ -2877,8 +2954,8 @@ static void newline_func_multi_line(chunk_t *start)
 
                   if (options::nl_func_call_args_multi_line_ignore_closures())
                   {
-                     chunk_t *prev_comma  = chunk_get_prev_ncnl(pc);
-                     chunk_t *after_comma = chunk_get_next_ncnl(pc);
+                     chunk_t *prev_comma  = chunk_get_prev_ncnnl(pc);
+                     chunk_t *after_comma = chunk_get_next_ncnnl(pc);
 
                      if (!(  (  prev_comma->parent_type == CT_OC_BLOCK_EXPR
                              || prev_comma->parent_type == CT_CPP_LAMBDA
@@ -2925,11 +3002,12 @@ static void newline_template(chunk_t *start)
    {
       return;
    }
-   chunk_t *pc = chunk_get_next_ncnl(start);
+   chunk_t *pc = chunk_get_next_ncnnl(start);
 
-   while (pc != nullptr && pc->level > start->level)
+   while (  pc != nullptr
+         && pc->level > start->level)
    {
-      pc = chunk_get_next_ncnl(pc);
+      pc = chunk_get_next_ncnnl(pc);
    }
 
    if (chunk_is_token(pc, CT_ANGLE_CLOSE))
@@ -2946,22 +3024,25 @@ static void newline_template(chunk_t *start)
 
       if (add_args)
       {
-         for (pc = chunk_get_next_ncnl(start);
-              pc != nullptr && pc->level > start->level;
-              pc = chunk_get_next_ncnl(pc))
+         chunk_t *pc_1;
+
+         for (pc_1 = chunk_get_next_ncnnl(start);
+              pc_1 != nullptr && pc_1->level > start->level;
+              pc_1 = chunk_get_next_ncnnl(pc_1))
          {
-            if (chunk_is_token(pc, CT_COMMA) && (pc->level == (start->level + 1)))
+            if (  chunk_is_token(pc_1, CT_COMMA)
+               && (pc_1->level == (start->level + 1)))
             {
-               chunk_t *tmp = chunk_get_next(pc);
+               chunk_t *tmp = chunk_get_next(pc_1);
 
                if (chunk_is_comment(tmp))
                {
-                  pc = tmp;
+                  pc_1 = tmp;
                }
 
-               if (!chunk_is_newline(chunk_get_next(pc)))
+               if (!chunk_is_newline(chunk_get_next(pc_1)))
                {
-                  newline_iarf(pc, IARF_ADD);
+                  newline_iarf(pc_1, IARF_ADD);
                }
             }
          }
@@ -2978,11 +3059,10 @@ static void newline_func_def_or_call(chunk_t *start)
            __func__, __LINE__, start->text(), start->orig_line, start->orig_col,
            get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
 
-   chunk_t *prev  = nullptr;
-   bool    is_def = (get_chunk_parent_type(start) == CT_FUNC_DEF)
-                    || get_chunk_parent_type(start) == CT_FUNC_CLASS_DEF;
-   bool    is_call = (get_chunk_parent_type(start) == CT_FUNC_CALL)
-                     || get_chunk_parent_type(start) == CT_FUNC_CALL_USER;
+   bool is_def = (get_chunk_parent_type(start) == CT_FUNC_DEF)
+                 || get_chunk_parent_type(start) == CT_FUNC_CLASS_DEF;
+   bool is_call = (get_chunk_parent_type(start) == CT_FUNC_CALL)
+                  || get_chunk_parent_type(start) == CT_FUNC_CALL_USER;
 
    LOG_FMT(LNFD, "%s(%d): is_def is %s, is_call is %s\n",
            __func__, __LINE__, is_def ? "TRUE" : "FALSE", is_call ? "TRUE" : "FALSE");
@@ -2994,14 +3074,14 @@ static void newline_func_def_or_call(chunk_t *start)
 
       if (atmp != IARF_IGNORE)
       {
-         prev = chunk_get_prev_ncnlni(start);   // Issue #2279
+         chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
 
          if (prev != nullptr)
          {
             newline_iarf(prev, atmp);
          }
       }
-      chunk_t *pc = chunk_get_next_ncnl(start);
+      chunk_t *pc = chunk_get_next_ncnnl(start);
 
       if (chunk_is_str(pc, ")", 1))
       {
@@ -3010,7 +3090,7 @@ static void newline_func_def_or_call(chunk_t *start)
 
          if (atmp != IARF_IGNORE)
          {
-            prev = chunk_get_prev_ncnlni(start);   // Issue #2279
+            chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
 
             if (prev != nullptr)
             {
@@ -3031,7 +3111,7 @@ static void newline_func_def_or_call(chunk_t *start)
    {
       log_rule_B("nl_func_def_paren");
       log_rule_B("nl_func_paren");
-      auto atmp = is_def ? options::nl_func_def_paren()
+      iarf_e atmp = is_def ? options::nl_func_def_paren()
                   : options::nl_func_paren();
       LOG_FMT(LSPACE, "%s(%d): atmp is %s\n",
               __func__, __LINE__,
@@ -3041,7 +3121,7 @@ static void newline_func_def_or_call(chunk_t *start)
 
       if (atmp != IARF_IGNORE)
       {
-         prev = chunk_get_prev_ncnlni(start);   // Issue #2279
+         chunk_t *prev = chunk_get_prev_ncnnlni(start);      // Issue #2279
 
          if (prev != nullptr)
          {
@@ -3049,17 +3129,17 @@ static void newline_func_def_or_call(chunk_t *start)
          }
       }
       // Handle break newlines type and function
-      prev = chunk_get_prev_ncnlni(start);   // Issue #2279
+      chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
       prev = skip_template_prev(prev);
       // Don't split up a function variable
-      prev = chunk_is_paren_close(prev) ? nullptr : chunk_get_prev_ncnlni(prev);   // Issue #2279
+      prev = chunk_is_paren_close(prev) ? nullptr : chunk_get_prev_ncnnlni(prev);   // Issue #2279
 
       log_rule_B("nl_func_class_scope");
 
       if (  chunk_is_token(prev, CT_DC_MEMBER)
          && (options::nl_func_class_scope() != IARF_IGNORE))
       {
-         newline_iarf(chunk_get_prev_ncnlni(prev), options::nl_func_class_scope());   // Issue #2279
+         newline_iarf(chunk_get_prev_ncnnlni(prev), options::nl_func_class_scope());   // Issue #2279
       }
 
       if (chunk_is_not_token(prev, CT_ACCESS_COLON))
@@ -3069,7 +3149,7 @@ static void newline_func_def_or_call(chunk_t *start)
          if (chunk_is_token(prev, CT_OPERATOR))
          {
             tmp  = prev;
-            prev = chunk_get_prev_ncnlni(prev);   // Issue #2279
+            prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
          }
          else
          {
@@ -3085,12 +3165,12 @@ static void newline_func_def_or_call(chunk_t *start)
                newline_iarf(prev, options::nl_func_scope_name());
             }
          }
-         const chunk_t *tmp_next = chunk_get_next_ncnl(prev);
+         const chunk_t *tmp_next = chunk_get_next_ncnnl(prev);
 
          if (chunk_is_not_token(tmp_next, CT_FUNC_CLASS_DEF))
          {
             chunk_t *closing = chunk_skip_to_match(tmp);
-            chunk_t *brace   = chunk_get_next_ncnl(closing);
+            chunk_t *brace   = chunk_get_next_ncnnl(closing);
             iarf_e  a;                                           // Issue #2561
 
             if (  get_chunk_parent_type(tmp) == CT_FUNC_PROTO
@@ -3125,7 +3205,8 @@ static void newline_func_def_or_call(chunk_t *start)
                a = options::nl_func_type_name_class();
             }
 
-            if (a != IARF_IGNORE && prev != nullptr)
+            if (  a != IARF_IGNORE
+               && prev != nullptr)
             {
                LOG_FMT(LNFD, "%s(%d): prev->text() '%s', orig_line is %zu, orig_col is %zu, [%s/%s]\n",
                        __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
@@ -3134,7 +3215,7 @@ static void newline_func_def_or_call(chunk_t *start)
 
                if (chunk_is_token(prev, CT_DESTRUCTOR))
                {
-                  prev = chunk_get_prev_ncnlni(prev);   // Issue #2279
+                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
                }
 
                /*
@@ -3143,9 +3224,9 @@ static void newline_func_def_or_call(chunk_t *start)
                 */
                while (chunk_is_token(prev, CT_DC_MEMBER))
                {
-                  prev = chunk_get_prev_ncnlni(prev);   // Issue #2279
+                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
                   prev = skip_template_prev(prev);
-                  prev = chunk_get_prev_ncnlni(prev);   // Issue #2279
+                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
                }
 
                if (  chunk_is_not_token(prev, CT_BRACE_CLOSE)
@@ -3164,7 +3245,7 @@ static void newline_func_def_or_call(chunk_t *start)
             }
          }
       }
-      chunk_t *pc = chunk_get_next_ncnl(start);
+      chunk_t *pc = chunk_get_next_ncnnl(start);
 
       if (chunk_is_str(pc, ")", 1))
       {
@@ -3184,7 +3265,7 @@ static void newline_func_def_or_call(chunk_t *start)
 
          if (atmp != IARF_IGNORE)
          {
-            prev = chunk_get_prev_ncnlni(start);   // Issue #2279
+            prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
 
             if (prev != nullptr)
             {
@@ -3199,11 +3280,12 @@ static void newline_func_def_or_call(chunk_t *start)
    chunk_t *tmp;
    chunk_t *pc;
 
-   for (pc = chunk_get_next_ncnl(start);
+   for (pc = chunk_get_next_ncnnl(start);
         pc != nullptr && pc->level > start->level;
-        pc = chunk_get_next_ncnl(pc))
+        pc = chunk_get_next_ncnnl(pc))
    {
-      if (chunk_is_token(pc, CT_COMMA) && (pc->level == (start->level + 1)))
+      if (  chunk_is_token(pc, CT_COMMA)
+         && (pc->level == (start->level + 1)))
       {
          comma_count++;
          tmp = chunk_get_next(pc);
@@ -3271,7 +3353,7 @@ static void newline_func_def_or_call(chunk_t *start)
    // and fix up the close parenthesis
    if (chunk_is_token(pc, CT_FPAREN_CLOSE))
    {
-      prev = chunk_get_prev_nnl(pc);
+      chunk_t *prev = chunk_get_prev_nnl(pc);
 
       if (  chunk_is_not_token(prev, CT_FPAREN_OPEN)
          && !is_call)
@@ -3300,7 +3382,7 @@ static void newline_oc_msg(chunk_t *start)
       return;
    }
 
-   for (chunk_t *pc = chunk_get_next_ncnl(start); pc; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_next_ncnnl(start); pc; pc = chunk_get_next_ncnnl(pc))
    {
       if (pc->level <= start->level)
       {
@@ -3318,6 +3400,7 @@ static void newline_oc_msg(chunk_t *start)
 static bool one_liner_nl_ok(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
+
    LOG_FMT(LNL1LINE, "%s(%d): check type is %s, parent is %s, flag is %s, orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
            pcf_flags_str(pc->flags).c_str(), pc->orig_line, pc->orig_col);
@@ -3447,6 +3530,14 @@ static bool one_liner_nl_ok(chunk_t *pc)
          LOG_FMT(LNL1LINE, "%s(%d): false (while)\n", __func__, __LINE__);
          return(false);
       }
+      log_rule_B("nl_do_leave_one_liners");
+
+      if (  options::nl_do_leave_one_liners()
+         && get_chunk_parent_type(pc) == CT_DO)
+      {
+         LOG_FMT(LNL1LINE, "%s(%d): false (do)\n", __func__, __LINE__);
+         return(false);
+      }
       log_rule_B("nl_for_leave_one_liners");
 
       if (  options::nl_for_leave_one_liners()
@@ -3465,7 +3556,8 @@ void undo_one_liner(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc != nullptr && pc->flags.test(PCF_ONE_LINER))
+   if (  pc != nullptr
+      && pc->flags.test(PCF_ONE_LINER))
    {
       LOG_FMT(LNL1LINE, "%s(%d): pc->text() '%s', orig_line is %zu, orig_col is %zu",
               __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
@@ -3514,10 +3606,11 @@ static void nl_create_one_liner(chunk_t *vbrace_open)
    LOG_FUNC_ENTRY();
 
    // See if we get a newline between the next text and the vbrace_close
-   chunk_t *tmp   = chunk_get_next_ncnl(vbrace_open);
+   chunk_t *tmp   = chunk_get_next_ncnnl(vbrace_open);
    chunk_t *first = tmp;
 
-   if (first == nullptr || get_token_pattern_class(first->type) != pattern_class_e::NONE)
+   if (  first == nullptr
+      || get_token_pattern_class(first->type) != pattern_class_e::NONE)
    {
       return;
    }
@@ -3537,11 +3630,12 @@ static void nl_create_one_liner(chunk_t *vbrace_open)
       tmp = chunk_get_next(tmp);
    }
 
-   if (tmp != nullptr && first != nullptr)
+   if (  tmp != nullptr
+      && first != nullptr)
    {
       newline_del_between(vbrace_open, first);
    }
-}
+} // nl_create_one_liner
 
 
 static void nl_create_list_liner(chunk_t *brace_open)
@@ -3549,13 +3643,12 @@ static void nl_create_list_liner(chunk_t *brace_open)
    LOG_FUNC_ENTRY();
 
    // See if we get a newline between the next text and the vbrace_close
-   chunk_t *closing = chunk_get_next_type(brace_open, CT_BRACE_CLOSE, brace_open->level);
-   chunk_t *tmp     = brace_open;
-
    if (brace_open == nullptr)
    {
       return;
    }
+   chunk_t *closing = chunk_get_next_type(brace_open, CT_BRACE_CLOSE, brace_open->level);
+   chunk_t *tmp     = brace_open;
 
    do
    {
@@ -3598,14 +3691,46 @@ void newlines_remove_newlines(void)
             pc = next;
             continue;
          }
-         else if (prev && !chunk_is_newline(prev->next))
+         else if (  prev != nullptr
+                 && !chunk_is_newline(prev->next))
          {
             pc = prev;
          }
       }
       pc = chunk_get_next_nl(pc);
    }
-}
+} // newlines_remove_newlines
+
+
+void newlines_remove_disallowed()
+{
+   LOG_FUNC_ENTRY();
+
+   chunk_t *pc = chunk_get_head();
+   chunk_t *next;
+
+   while ((pc = chunk_get_next_nl(pc)) != nullptr)
+   {
+      LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, <Newline>, nl is %zu\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->nl_count);
+
+      next = chunk_get_next(pc);
+
+      if (  next != nullptr
+         && !chunk_is_token(next, CT_NEWLINE)
+         && !can_increase_nl(pc))
+      {
+         LOG_FMT(LBLANKD, "%s(%d): force to 1 orig_line is %zu, orig_col is %zu\n",
+                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+
+         if (pc->nl_count != 1)
+         {
+            pc->nl_count = 1;
+            MARK_CHANGE();
+         }
+      }
+   }
+} // newlines_remove_disallowed
 
 
 void newlines_cleanup_angles()
@@ -3613,17 +3738,18 @@ void newlines_cleanup_angles()
    // Issue #1167
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
+      char copy[1000];
       LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
 
       if (chunk_is_token(pc, CT_ANGLE_OPEN))
       {
          newline_template(pc);
       }
    }
-}
+} // newlines_cleanup_angles
 
 
 void newlines_cleanup_braces(bool first)
@@ -3635,18 +3761,17 @@ void newlines_cleanup_braces(bool first)
 
    if (chunk_is_newline(pc = chunk_get_head()))
    {
-      pc = chunk_get_next_ncnl(pc);
+      pc = chunk_get_next_ncnnl(pc);
    }
-   chunk_t *next;
-   chunk_t *prev;
-   chunk_t *tmp;
 
-   for ( ; pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for ( ; pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
+      char copy[1000];
       LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
 
-      if (chunk_is_token(pc, CT_IF) || chunk_is_token(pc, CT_CONSTEXPR))
+      if (  chunk_is_token(pc, CT_IF)
+         || chunk_is_token(pc, CT_CONSTEXPR))
       {
          log_rule_B("nl_if_brace");
          newlines_if_for_while_switch(pc, options::nl_if_brace());
@@ -3679,7 +3804,7 @@ void newlines_cleanup_braces(bool first)
             log_rule_B("nl_brace_catch");
             newlines_cuddle_uncuddle(pc, options::nl_brace_catch());
          }
-         next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
          if (chunk_is_token(next, CT_BRACE_OPEN))
          {
@@ -3757,7 +3882,7 @@ void newlines_cleanup_braces(bool first)
       {
          log_rule_B("nl_brace_else");
          newlines_cuddle_uncuddle(pc, options::nl_brace_else());
-         next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
          if (chunk_is_token(next, CT_ELSEIF))
          {
@@ -3772,7 +3897,7 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_try_brace");
          newlines_do_else(pc, options::nl_try_brace());
          // Issue #1734
-         chunk_t *po = chunk_get_next_ncnl(pc);
+         chunk_t *po = chunk_get_next_ncnnl(pc);
          flag_parens(po, PCF_IN_TRY_BLOCK, po->type, CT_NONE, false);
       }
       else if (chunk_is_token(pc, CT_GETSET))
@@ -3802,7 +3927,7 @@ void newlines_cleanup_braces(bool first)
 
             if (options::nl_paren_dbrace_open() != IARF_IGNORE)
             {
-               prev = chunk_get_prev_ncnlni(pc, scope_e::PREPROC);   // Issue #2279
+               chunk_t *prev = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);   // Issue #2279
 
                if (chunk_is_paren_close(prev))
                {
@@ -3856,6 +3981,8 @@ void newlines_cleanup_braces(bool first)
          {
             if (pc->level == pc->brace_level)
             {
+               chunk_t *tmp = nullptr;
+
                // Request #126
                // introduce two new options
                // look back if we have a @interface or a @implementation
@@ -3897,8 +4024,17 @@ void newlines_cleanup_braces(bool first)
                nl_create_list_liner(pc);
                break;
             }
-            log_rule_B("nl_type_brace_init_lst");
-            newline_iarf_pair(chunk_get_prev_nnl(pc), pc, options::nl_type_brace_init_lst(), true);
+            chunk_t *prev = chunk_get_prev_nnl(pc);
+
+            if (  prev != nullptr
+               && (  prev->type == CT_TYPE
+                  || prev->type == CT_WORD
+                  || prev->parent_type == CT_TEMPLATE
+                  || prev->parent_type == CT_DECLTYPE))
+            {
+               log_rule_B("nl_type_brace_init_lst");
+               newline_iarf_pair(prev, pc, options::nl_type_brace_init_lst(), true);
+            }
             break;
          }
 
@@ -3938,14 +4074,14 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_brace() != IARF_IGNORE)
          {
-            next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
 
             if (chunk_is_token(next, CT_BRACE_OPEN))
             {
                newline_iarf_pair(pc, next, options::nl_brace_brace());
             }
          }
-         next = chunk_get_next_nnl(pc);
+         chunk_t *next = chunk_get_next_nnl(pc);
 
          if (next == nullptr)
          {
@@ -3961,7 +4097,7 @@ void newlines_cleanup_braces(bool first)
          }
          else
          {
-            next = chunk_get_next_ncnl(pc);
+            next = chunk_get_next_ncnnl(pc);
 
             // Handle unnamed temporary direct-list-initialization
             if (get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)
@@ -3990,7 +4126,7 @@ void newlines_cleanup_braces(bool first)
                else
                {
                   // Step back from next to the first non-newline item
-                  tmp = chunk_get_prev(next);
+                  chunk_t *tmp = chunk_get_prev(next);
 
                   while (tmp != pc)
                   {
@@ -4031,7 +4167,7 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_brace() != IARF_IGNORE)
          {
-            next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
 
             if (chunk_is_token(next, CT_BRACE_CLOSE))
             {
@@ -4043,7 +4179,7 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_square() != IARF_IGNORE)
          {
-            next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
 
             if (chunk_is_token(next, CT_SQUARE_CLOSE))
             {
@@ -4055,7 +4191,7 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_fparen() != IARF_IGNORE)
          {
-            next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
 
             log_rule_B("nl_brace_fparen");
 
@@ -4087,13 +4223,22 @@ void newlines_cleanup_braces(bool first)
          if (options::eat_blanks_before_close_brace())
          {
             // Limit the newlines before the close brace to 1
-            prev = chunk_get_prev(pc);
+            chunk_t *prev = chunk_get_prev(pc);
 
             if (chunk_is_newline(prev))
             {
                log_rule_B("nl_inside_namespace");
+               log_rule_B("nl_inside_empty_func");
 
-               if (options::nl_inside_namespace() && get_chunk_parent_type(pc) == CT_NAMESPACE)
+               if (  options::nl_inside_empty_func() > 0
+                  && chunk_is_token(chunk_get_prev_nnl(pc), CT_BRACE_OPEN)
+                  && (  get_chunk_parent_type(pc) == CT_FUNC_CLASS_DEF
+                     || get_chunk_parent_type(pc) == CT_FUNC_DEF))
+               {
+                  blank_line_set(prev, options::nl_inside_empty_func);
+               }
+               else if (  options::nl_inside_namespace() > 0
+                       && get_chunk_parent_type(pc) == CT_NAMESPACE)
                {
                   blank_line_set(prev, options::nl_inside_namespace);
                }
@@ -4116,7 +4261,7 @@ void newlines_cleanup_braces(bool first)
             if (!pc->flags.test(PCF_ONE_LINER))
             {
                // Make sure the brace is preceded by two newlines
-               prev = chunk_get_prev(pc);
+               chunk_t *prev = chunk_get_prev(pc);
 
                if (!chunk_is_newline(prev))
                {
@@ -4137,7 +4282,7 @@ void newlines_cleanup_braces(bool first)
                || get_chunk_parent_type(pc) == CT_ENUM
                || get_chunk_parent_type(pc) == CT_UNION))
          {
-            next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+            chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
             if (  chunk_is_not_token(next, CT_SEMICOLON)
                && chunk_is_not_token(next, CT_COMMA))
@@ -4154,7 +4299,7 @@ void newlines_cleanup_braces(bool first)
                     || get_chunk_parent_type(pc) == CT_OC_MSG_DECL))
          {
             log_rule_B("nl_after_brace_close");
-            next = chunk_get_next(pc);
+            chunk_t *next = chunk_get_next(pc);
 
             if (  chunk_is_not_token(next, CT_SEMICOLON)
                && chunk_is_not_token(next, CT_COMMA)
@@ -4182,9 +4327,9 @@ void newlines_cleanup_braces(bool first)
 
             if (options::nl_after_namespace() > 0)
             {
-               next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+               chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
-               if (next)
+               if (next != nullptr)
                {
                   newline_add_before(next);
                   // newline_iarf(next, IARF_ADD);
@@ -4200,8 +4345,8 @@ void newlines_cleanup_braces(bool first)
          if (  options::nl_after_vbrace_open()
             || options::nl_after_vbrace_open_empty())
          {
-            next = chunk_get_next(pc, scope_e::PREPROC);
-            bool add_it;
+            chunk_t *next = chunk_get_next(pc, scope_e::PREPROC);
+            bool    add_it;
 
             if (chunk_is_semicolon(next))
             {
@@ -4260,9 +4405,10 @@ void newlines_cleanup_braces(bool first)
 
                for (chunk_t *temp = pc; temp != end; temp = chunk_get_next(temp))
                {
-                  LOG_FMT(LNEWLINE, "%s(%d): text() is '%s', type is %s, level is %zu\n   ",
+                  LOG_FMT(LNEWLINE, "%s(%d): text() is '%s', type is %s, level is %zu\n",
                           __func__, __LINE__, temp->text(), get_token_name(temp->type), temp->level);
-                  log_pcf_flags(LNEWLINE, temp->flags);
+                  // produces much more log output. Use it only debugging purpose
+                  //log_pcf_flags(LNEWLINE, temp->flags);
                   chunk_flags_clr(temp, PCF_ONE_LINER);
                }
 
@@ -4283,7 +4429,8 @@ void newlines_cleanup_braces(bool first)
             }
          }
       }
-      else if (chunk_is_token(pc, CT_SQUARE_OPEN) && get_chunk_parent_type(pc) == CT_OC_MSG)
+      else if (  chunk_is_token(pc, CT_SQUARE_OPEN)
+              && get_chunk_parent_type(pc) == CT_OC_MSG)
       {
          log_rule_B("nl_oc_msg_args");
 
@@ -4318,30 +4465,30 @@ void newlines_cleanup_braces(bool first)
       }
       else if (chunk_is_token(pc, CT_THROW))
       {
-         prev = chunk_get_prev(pc);
+         chunk_t *prev = chunk_get_prev(pc);
 
          if (  chunk_is_token(prev, CT_PAREN_CLOSE)
             || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
          {
             log_rule_B("nl_before_throw");
-            newline_iarf(chunk_get_prev_ncnlni(pc), options::nl_before_throw());   // Issue #2279
+            newline_iarf(chunk_get_prev_ncnnlni(pc), options::nl_before_throw());   // Issue #2279
          }
       }
       else if (  chunk_is_token(pc, CT_QUALIFIER)
               && !strcmp(pc->text(), "throws"))
       {
-         prev = chunk_get_prev(pc);
+         chunk_t *prev = chunk_get_prev(pc);
 
          if (  chunk_is_token(prev, CT_PAREN_CLOSE)
             || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
          {
             log_rule_B("nl_before_throw");
-            newline_iarf(chunk_get_prev_ncnlni(pc), options::nl_before_throw());   // Issue #2279
+            newline_iarf(chunk_get_prev_ncnnlni(pc), options::nl_before_throw());   // Issue #2279
          }
       }
       else if (chunk_is_token(pc, CT_CASE_COLON))
       {
-         next = chunk_get_next_nnl(pc);
+         chunk_t *next = chunk_get_next_nnl(pc);
 
          log_rule_B("nl_case_colon_brace");
 
@@ -4358,7 +4505,7 @@ void newlines_cleanup_braces(bool first)
       }
       else if (chunk_is_token(pc, CT_SPAREN_CLOSE))
       {
-         next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
          if (chunk_is_token(next, CT_BRACE_OPEN))
          {
@@ -4392,7 +4539,7 @@ void newlines_cleanup_braces(bool first)
             && !pc->flags.test(PCF_IN_PREPROC)
             && options::nl_after_semicolon())
          {
-            next = chunk_get_next(pc);
+            chunk_t *next = chunk_get_next(pc);
 
             while (chunk_is_token(next, CT_VBRACE_CLOSE))
             {
@@ -4524,7 +4671,8 @@ void newlines_cleanup_braces(bool first)
             }
             newline_func_multi_line(pc);
          }
-         else if (first && (options::nl_remove_extra_newlines() == 1))
+         else if (  first
+                 && (options::nl_remove_extra_newlines() == 1))
          {
             log_rule_B("nl_remove_extra_newlines");
             newline_iarf(pc, IARF_REMOVE);
@@ -4544,11 +4692,12 @@ void newlines_cleanup_braces(bool first)
       {
          if (get_chunk_parent_type(pc) == CT_TEMPLATE)
          {
-            next = chunk_get_next_ncnl(pc);
+            chunk_t *next = chunk_get_next_ncnnl(pc);
 
-            if (next != nullptr && next->level == next->brace_level)
+            if (  next != nullptr
+               && next->level == next->brace_level)
             {
-               tmp = chunk_get_prev_ncnlni(chunk_get_prev_type(pc, CT_ANGLE_OPEN, pc->level));   // Issue #2279
+               chunk_t *tmp = chunk_get_prev_ncnnlni(chunk_get_prev_type(pc, CT_ANGLE_OPEN, pc->level));   // Issue #2279
 
                if (chunk_is_token(tmp, CT_TEMPLATE))
                {
@@ -4559,7 +4708,7 @@ void newlines_cleanup_braces(bool first)
                   }
                   else if (get_chunk_parent_type(next) == CT_FUNC_DEF) // function definition
                   {
-                     auto const action =
+                     iarf_e const action =
                         newline_template_option(
                            pc,
                            options::nl_template_func_def_special(),
@@ -4572,7 +4721,7 @@ void newlines_cleanup_braces(bool first)
                   }
                   else if (get_chunk_parent_type(next) == CT_FUNC_PROTO) // function declaration
                   {
-                     auto const action =
+                     iarf_e const action =
                         newline_template_option(
                            pc,
                            options::nl_template_func_decl_special(),
@@ -4591,7 +4740,7 @@ void newlines_cleanup_braces(bool first)
                   }
                   else if (next->flags.test(PCF_INCOMPLETE)) // class declaration
                   {
-                     auto const action =
+                     iarf_e const action =
                         newline_template_option(
                            pc,
                            options::nl_template_class_decl_special(),
@@ -4604,7 +4753,7 @@ void newlines_cleanup_braces(bool first)
                   }
                   else // class definition
                   {
-                     auto const action =
+                     iarf_e const action =
                         newline_template_option(
                            pc,
                            options::nl_template_class_def_special(),
@@ -4623,11 +4772,11 @@ void newlines_cleanup_braces(bool first)
               && get_chunk_parent_type(pc) != CT_USING)
       {
          // Issue #2387
-         next = chunk_get_next_ncnl(pc);
+         chunk_t *next = chunk_get_next_ncnnl(pc);
 
          if (next != nullptr)
          {
-            next = chunk_get_next_ncnl(next);
+            next = chunk_get_next_ncnnl(next);
 
             if (!chunk_is_token(next, CT_ASSIGN))
             {
@@ -4644,16 +4793,18 @@ void newlines_cleanup_braces(bool first)
                }
                LOG_FMT(LNEWLINE, "%s(%d): braceOpen->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
                        __func__, __LINE__, braceOpen->orig_line, braceOpen->orig_col, braceOpen->text());
-               log_pcf_flags(LNEWLINE, braceOpen->flags);
+               // produces much more log output. Use it only debugging purpose
+               //log_pcf_flags(LNEWLINE, braceOpen->flags);
                newlines_namespace(pc);
             }
          }
       }
       else if (chunk_is_token(pc, CT_SQUARE_OPEN))
       {
-         if (get_chunk_parent_type(pc) == CT_ASSIGN && !pc->flags.test(PCF_ONE_LINER))
+         if (  get_chunk_parent_type(pc) == CT_ASSIGN
+            && !pc->flags.test(PCF_ONE_LINER))
          {
-            tmp = chunk_get_prev_ncnlni(pc);   // Issue #2279
+            chunk_t *tmp = chunk_get_prev_ncnnlni(pc);   // Issue #2279
             newline_iarf(tmp, options::nl_assign_square());
             log_rule_B("nl_assign_square");
 
@@ -4690,7 +4841,7 @@ void newlines_cleanup_braces(bool first)
          if (options::nl_before_access_spec() > 0)
          {
             log_rule_B("nl_before_access_spec");
-            prev = chunk_get_prev(pc);
+            chunk_t *prev = chunk_get_prev(pc);
 
             if (!chunk_is_newline(prev))
             {
@@ -4704,7 +4855,7 @@ void newlines_cleanup_braces(bool first)
          if (options::nl_after_access_spec() > 0)
          {
             log_rule_B("nl_after_access_spec");
-            next = chunk_get_next(pc);
+            chunk_t *next = chunk_get_next(pc);
 
             if (!chunk_is_newline(next))
             {
@@ -4753,6 +4904,7 @@ void newlines_cleanup_braces(bool first)
 static void nl_handle_define(chunk_t *pc)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *nl  = pc;
    chunk_t *ref = nullptr;
 
@@ -4764,7 +4916,8 @@ static void nl_handle_define(chunk_t *pc)
       }
 
       if (  chunk_is_token(nl, CT_MACRO)
-         || (chunk_is_token(nl, CT_FPAREN_CLOSE) && get_chunk_parent_type(nl) == CT_MACRO_FUNC))
+         || (  chunk_is_token(nl, CT_FPAREN_CLOSE)
+            && get_chunk_parent_type(nl) == CT_MACRO_FUNC))
       {
          ref = nl;
       }
@@ -4778,7 +4931,7 @@ static void nl_handle_define(chunk_t *pc)
          return;
       }
    }
-}
+} // nl_handle_define
 
 
 void newline_after_multiline_comment(void)
@@ -4793,7 +4946,8 @@ void newline_after_multiline_comment(void)
       }
       chunk_t *tmp = pc;
 
-      while (((tmp = chunk_get_next(tmp)) != nullptr) && !chunk_is_newline(tmp))
+      while (  ((tmp = chunk_get_next(tmp)) != nullptr)
+            && !chunk_is_newline(tmp))
       {
          if (!chunk_is_comment(tmp))
          {
@@ -4802,7 +4956,7 @@ void newline_after_multiline_comment(void)
          }
       }
    }
-}
+} // newline_after_multiline_comment
 
 
 void newline_after_label_colon(void)
@@ -4817,7 +4971,7 @@ void newline_after_label_colon(void)
       }
       newline_add_after(pc);
    }
-}
+} // newline_after_label_colon
 
 
 static bool is_class_one_liner(chunk_t *pc)
@@ -4828,17 +4982,18 @@ static bool is_class_one_liner(chunk_t *pc)
    {
       // Find opening brace
       pc = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
-      return(pc != nullptr && pc->flags.test(PCF_ONE_LINER));
+      return(  pc != nullptr
+            && pc->flags.test(PCF_ONE_LINER));
    }
    return(false);
-}
+} // is_class_one_liner
 
 
 void newlines_insert_blank_lines(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       //LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
       //        __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
@@ -4953,7 +5108,8 @@ void newlines_functions_remove_extra_blank_lines(void)
 
       while (pc != nullptr)
       {
-         if (chunk_is_token(pc, CT_BRACE_CLOSE) && pc->level == startMoveLevel)
+         if (  chunk_is_token(pc, CT_BRACE_CLOSE)
+            && pc->level == startMoveLevel)
          {
             break;
          }
@@ -4983,10 +5139,11 @@ void newlines_squeeze_ifdef(void)
 
    chunk_t *pc;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (  chunk_is_token(pc, CT_PREPROC)
-         && (pc->level > 0 || options::nl_squeeze_ifdef_top_level()))
+         && (  pc->level > 0
+            || options::nl_squeeze_ifdef_top_level()))
       {
          log_rule_B("nl_squeeze_ifdef_top_level");
          chunk_t *ppr = chunk_get_next(pc);
@@ -4998,7 +5155,8 @@ void newlines_squeeze_ifdef(void)
             chunk_t *pnl = nullptr;
             chunk_t *nnl = chunk_get_next_nl(ppr);
 
-            if (chunk_is_token(ppr, CT_PP_ELSE) || chunk_is_token(ppr, CT_PP_ENDIF))
+            if (  chunk_is_token(ppr, CT_PP_ELSE)
+               || chunk_is_token(ppr, CT_PP_ENDIF))
             {
                pnl = chunk_get_prev_nl(pc);
             }
@@ -5022,7 +5180,8 @@ void newlines_squeeze_ifdef(void)
                   }
                }
 
-               if (chunk_is_token(ppr, CT_PP_IF) || chunk_is_token(ppr, CT_PP_ELSE))
+               if (  chunk_is_token(ppr, CT_PP_IF)
+                  || chunk_is_token(ppr, CT_PP_ELSE))
                {
                   if (nnl->nl_count > 1)
                   {
@@ -5061,7 +5220,10 @@ void newlines_squeeze_paren_close(void)
       }
       next = chunk_get_next(pc);
 
-      if (next != nullptr && prev != nullptr && chunk_is_paren_close(next) && chunk_is_paren_close(prev))
+      if (  next != nullptr
+         && prev != nullptr
+         && chunk_is_paren_close(next)
+         && chunk_is_paren_close(prev))
       {
          chunk_t *prev_op = chunk_skip_to_match_rev(prev);
          chunk_t *next_op = chunk_skip_to_match_rev(next);
@@ -5105,6 +5267,7 @@ void newlines_squeeze_paren_close(void)
 void newlines_eat_start_end(void)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *pc;
 
    // Process newlines at the start of the file
@@ -5149,6 +5312,7 @@ void newlines_eat_start_end(void)
             set_chunk_type(&chunk, CT_NEWLINE);
             chunk.orig_line = pc->orig_line;
             chunk.orig_col  = pc->orig_col;
+            chunk.pp_level  = pc->pp_level;
             chunk.nl_count  = options::nl_start_of_file_min();
             log_rule_B("nl_start_of_file_min");
             chunk_add_before(&chunk, pc);
@@ -5207,6 +5371,7 @@ void newlines_eat_start_end(void)
             set_chunk_type(&chunk, CT_NEWLINE);
             chunk.orig_line = pc->orig_line;
             chunk.orig_col  = pc->orig_col;
+            chunk.pp_level  = pc->pp_level;
             chunk.nl_count  = options::nl_end_of_file_min();
             log_rule_B("nl_end_of_file_min");
             chunk_add_before(&chunk, nullptr);
@@ -5232,11 +5397,13 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
       return;
    }
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
-      LOG_FMT(LNEWLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s'\n   ",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
-      log_pcf_flags(LNEWLINE, pc->flags);
+      char copy[1000];
+      LOG_FMT(LNEWLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s'\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
+      // produces much more log output. Use it only debugging purpose
+      //log_pcf_flags(LNEWLINE, pc->flags);
 
       if (chunk_is_token(pc, chunk_type))
       {
@@ -5244,9 +5411,10 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
 
          if (chunk_type == CT_COMMA)
          {
-            LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n   ",
+            LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
                     __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            log_pcf_flags(LNEWLINE, pc->flags);
+            // produces much more log output. Use it only debugging purpose
+            //log_pcf_flags(LNEWLINE, pc->flags);
 
             if (pc->flags.test(PCF_IN_CONST_ARGS)) // Issue #2250
             {
@@ -5303,7 +5471,8 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
                // remove newline if not preceded by a comment
                chunk_t *prev2 = chunk_get_prev(prev);
 
-               if (prev2 != nullptr && !(chunk_is_comment(prev2)))
+               if (  prev2 != nullptr
+                  && !(chunk_is_comment(prev2)))
                {
                   remove_next_newlines(prev2);
                }
@@ -5314,7 +5483,8 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
                // remove newline if not followed by a comment
                chunk_t *next2 = chunk_get_next(next);
 
-               if (next2 != nullptr && !(chunk_is_comment(next2)))
+               if (  next2 != nullptr
+                  && !(chunk_is_comment(next2)))
                {
                   remove_next_newlines(pc);
                }
@@ -5322,15 +5492,19 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
             continue;
          }
 
-         if (  (nl_flag == 0 && !(mode_local & (TP_FORCE | TP_BREAK)))
-            || (nl_flag == 3 && !(mode_local & TP_FORCE)))
+         if (  (  nl_flag == 0
+               && !(mode_local & (TP_FORCE | TP_BREAK)))
+            || (  nl_flag == 3
+               && !(mode_local & TP_FORCE)))
          {
             // No newlines and not adding any or both and not forcing
             continue;
          }
 
-         if (  ((mode_local & TP_LEAD) && nl_flag == 1)
-            || ((mode_local & TP_TRAIL) && nl_flag == 2))
+         if (  (  (mode_local & TP_LEAD)
+               && nl_flag == 1)
+            || (  (mode_local & TP_TRAIL)
+               && nl_flag == 2))
          {
             // Already a newline before (lead) or after (trail)
             continue;
@@ -5359,7 +5533,7 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
             }
             else
             {
-               remove_next_newlines(chunk_get_prev_ncnlni(pc));   // Issue #2279
+               remove_next_newlines(chunk_get_prev_ncnnlni(pc));   // Issue #2279
             }
             continue;
          }
@@ -5378,8 +5552,12 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
 
             if (next->nl_count == 1)
             {
-               // move the CT_BOOL to after the newline
-               chunk_move_after(pc, next);
+               if (  prev != nullptr
+                  && !prev->flags.test(PCF_IN_PREPROC))
+               {
+                  // move the CT_BOOL to after the newline
+                  chunk_move_after(pc, next);
+               }
             }
          }
          else
@@ -5458,7 +5636,7 @@ void newlines_class_colon_pos(c_token_t tok)
       log_rule_B("align_on_tabstop");
    }
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (  ccolon == nullptr
          && chunk_is_not_token(pc, tok))
@@ -5482,7 +5660,8 @@ void newlines_class_colon_pos(c_token_t tok)
                     __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
             chunk_t *paren_vor_value = chunk_get_next_type(pc, CT_FPAREN_OPEN, pc->level);
 
-            if (with_acv && paren_vor_value != nullptr)
+            if (  with_acv
+               && paren_vor_value != nullptr)
             {
                LOG_FMT(LBLANKD, "%s(%d): paren_vor_value->orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
                        __func__, __LINE__, paren_vor_value->orig_line, paren_vor_value->orig_col,
@@ -5578,7 +5757,12 @@ void newlines_class_colon_pos(c_token_t tok)
                {
                   if (ncia == IARF_FORCE)          // nl_class_init_args, nl_constr_init_args: 5
                   {
-                     newline_force_after(pc);
+                     chunk_t *after = chunk_get_next(pc);   // Issue #2759
+
+                     if (chunk_is_not_token(after, CT_COMMENT_CPP))
+                     {
+                        newline_force_after(pc);
+                     }
                   }
                   else
                   {
@@ -5655,21 +5839,23 @@ static void blank_line_max(chunk_t *pc, Option<unsigned> &opt)
    }
    const auto optval = opt();
 
-   if ((optval > 0) && (pc->nl_count > optval))
+   if (  (optval > 0)
+      && (pc->nl_count > optval))
    {
       LOG_FMT(LBLANKD, "%s(%d): do_blank_lines: %s max line %zu\n",
               __func__, __LINE__, opt.name(), pc->orig_line);
       pc->nl_count = optval;
       MARK_CHANGE();
    }
-}
+} // blank_line_max
 
 
 iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base, iarf_e fallback)
 {
-   auto *const prev = chunk_get_prev_ncnl(pc);
+   chunk_t *const prev = chunk_get_prev_ncnnl(pc);
 
-   if (chunk_is_token(prev, CT_ANGLE_OPEN) && special != IARF_IGNORE)
+   if (  chunk_is_token(prev, CT_ANGLE_OPEN)
+      && special != IARF_IGNORE)
    {
       return(special);
    }
@@ -5681,12 +5867,13 @@ iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base, iarf_e
    {
       return(fallback);
    }
-}
+} // newline_template_option
 
 
 bool is_func_proto_group(chunk_t *pc, c_token_t one_liner_type)
 {
-   if (  pc && options::nl_class_leave_one_liner_groups()
+   if (  pc != nullptr
+      && options::nl_class_leave_one_liner_groups()
       && (  chunk_is_token(pc, one_liner_type)
          || get_chunk_parent_type(pc) == one_liner_type)
       && pc->flags.test(PCF_IN_CLASS))
@@ -5701,11 +5888,12 @@ bool is_func_proto_group(chunk_t *pc, c_token_t one_liner_type)
       {
          // Find opening brace
          pc = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
-         return(pc != nullptr && pc->flags.test(PCF_ONE_LINER));
+         return(  pc != nullptr
+               && pc->flags.test(PCF_ONE_LINER));
       }
    }
    return(false);
-}
+} // is_func_proto_group
 
 
 void do_blank_lines(void)
@@ -5721,10 +5909,12 @@ void do_blank_lines(void)
       }
       else
       {
+         char copy[1000];
          LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type));
       }
-      bool line_added = false;
+      LOG_FMT(LBLANK, "%s(%d): nl_count is %zu\n",
+              __func__, __LINE__, pc->nl_count);
 
       //if (pc->type != CT_NEWLINE)
       if (chunk_is_not_token(pc, CT_NEWLINE))
@@ -5747,6 +5937,8 @@ void do_blank_lines(void)
       chunk_t *next = chunk_get_next(pc);
       chunk_t *pcmt = chunk_get_prev(pc);
 
+      bool    line_added = false;
+
       /*
        * If this is the first or the last token, pretend that there is an extra
        * line. It will be removed at the end.
@@ -5834,10 +6026,12 @@ void do_blank_lines(void)
       }
 
       // Control blanks before a class
-      if (  (chunk_is_token(prev, CT_SEMICOLON) || chunk_is_token(prev, CT_BRACE_CLOSE))
+      if (  (  chunk_is_token(prev, CT_SEMICOLON)
+            || chunk_is_token(prev, CT_BRACE_CLOSE))
          && get_chunk_parent_type(prev) == CT_CLASS)
       {
-         chunk_t *tmp = chunk_get_prev_type(prev, CT_CLASS, prev->level);
+         chunk_t *start = chunk_get_prev_type(prev, CT_CLASS, prev->level);
+         chunk_t *tmp   = start;
 
          // Is this a class template?
          if (get_chunk_parent_type(tmp) == CT_TEMPLATE)
@@ -5868,7 +6062,9 @@ void do_blank_lines(void)
             tmp = chunk_get_prev_nc(tmp->prev);
          }
 
-         if (tmp != nullptr && options::nl_before_class() > tmp->nl_count)
+         if (  tmp != nullptr
+            && !start->flags.test(PCF_INCOMPLETE)
+            && options::nl_before_class() > tmp->nl_count)
          {
             log_rule_B("nl_before_class");
             blank_line_set(tmp, options::nl_before_class);
@@ -5888,7 +6084,8 @@ void do_blank_lines(void)
             tmp = chunk_get_prev_nc(tmp->prev);
          }
 
-         if (tmp != nullptr && options::nl_before_namespace() > tmp->nl_count)
+         if (  tmp != nullptr
+            && options::nl_before_namespace() > tmp->nl_count)
          {
             log_rule_B("nl_before_namespace");
             blank_line_set(tmp, options::nl_before_namespace);
@@ -6021,7 +6218,8 @@ void do_blank_lines(void)
       }
 
       // Add blanks after struct/enum/union/class
-      if (  (chunk_is_token(prev, CT_SEMICOLON) || chunk_is_token(prev, CT_BRACE_CLOSE))
+      if (  (  chunk_is_token(prev, CT_SEMICOLON)
+            || chunk_is_token(prev, CT_BRACE_CLOSE))
          && (  get_chunk_parent_type(prev) == CT_STRUCT
             || get_chunk_parent_type(prev) == CT_ENUM
             || get_chunk_parent_type(prev) == CT_UNION
@@ -6037,9 +6235,9 @@ void do_blank_lines(void)
          {
             // Issue #1702
             // look back if we have a variable
-            auto tmp         = pc;
-            bool is_var_def  = false;
-            bool is_fwd_decl = false;
+            chunk_t *tmp        = pc;
+            bool    is_var_def  = false;
+            bool    is_fwd_decl = false;
 
             while ((tmp = chunk_get_prev(tmp)) != nullptr)
             {
@@ -6067,7 +6265,8 @@ void do_blank_lines(void)
                     is_var_def ? "yes" : "no",
                     is_fwd_decl ? "yes" : "no");
 
-            if (!is_var_def && !is_fwd_decl)
+            if (  !is_var_def
+               && !is_fwd_decl)
             {
                blank_line_set(pc, opt);
             }
@@ -6123,7 +6322,8 @@ void do_blank_lines(void)
 
          if (  get_chunk_parent_type(prev) == CT_GETSET
             && chunk_is_not_token(next, CT_BRACE_CLOSE)
-            && (chunk_is_token(prev, CT_BRACE_CLOSE) || chunk_is_token(prev, CT_SEMICOLON)))
+            && (  chunk_is_token(prev, CT_BRACE_CLOSE)
+               || chunk_is_token(prev, CT_SEMICOLON)))
          {
             blank_line_set(pc, options::nl_between_get_set);
             log_rule_B("nl_between_get_set");
@@ -6243,7 +6443,7 @@ void do_blank_lines(void)
       {
          --pc->nl_count;
       }
-      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text is '%s', nl_count changed to %zu\n",
+      LOG_FMT(LBLANK, "%s(%d): orig_line is %zu, orig_col is %zu, text is '%s', nl_count is now %zu\n",
               __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), pc->nl_count);
    }
 } // do_blank_lines
@@ -6260,7 +6460,8 @@ void newlines_cleanup_dup(void)
    {
       next = chunk_get_next(next);
 
-      if (chunk_is_token(pc, CT_NEWLINE) && chunk_is_token(next, CT_NEWLINE))
+      if (  chunk_is_token(pc, CT_NEWLINE)
+         && chunk_is_token(next, CT_NEWLINE))
       {
          next->nl_count = max(pc->nl_count, next->nl_count);
          chunk_del(pc);
@@ -6268,12 +6469,13 @@ void newlines_cleanup_dup(void)
       }
       pc = next;
    }
-}
+} // newlines_cleanup_dup
 
 
 static void newlines_enum_entries(chunk_t *open_brace, iarf_e av)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *pc = open_brace;
 
    while (  (pc = chunk_get_next_nc(pc)) != nullptr
@@ -6291,12 +6493,13 @@ static void newlines_enum_entries(chunk_t *open_brace, iarf_e av)
       newline_iarf(pc, av);
    }
    newline_iarf(open_brace, av);
-}
+} // newlines_enum_entries
 
 
 static void newlines_double_space_struct_enum_union(chunk_t *open_brace)
 {
    LOG_FUNC_ENTRY();
+
    chunk_t *pc = open_brace;
 
    while (  (pc = chunk_get_next_nc(pc)) != nullptr
@@ -6324,7 +6527,7 @@ static void newlines_double_space_struct_enum_union(chunk_t *open_brace)
          }
       }
    }
-}
+} // newlines_double_space_struct_enum_union
 
 
 void annotations_newlines(void)
@@ -6350,7 +6553,7 @@ void annotations_newlines(void)
          ae = pc;
       }
 
-      if (!ae)
+      if (ae == nullptr)
       {
          break;
       }
@@ -6387,13 +6590,14 @@ void annotations_newlines(void)
 
 bool newlines_between(chunk_t *pc_start, chunk_t *pc_end, size_t &newlines, scope_e scope)
 {
-   if (pc_start == nullptr || pc_end == nullptr)
+   if (  pc_start == nullptr
+      || pc_end == nullptr)
    {
       return(false);
    }
    newlines = 0;
 
-   auto it = pc_start;
+   chunk_t *it = pc_start;
 
    for ( ; it != nullptr && it != pc_end; it = chunk_get_next(it, scope))
    {
@@ -6402,4 +6606,4 @@ bool newlines_between(chunk_t *pc_start, chunk_t *pc_end, size_t &newlines, scop
 
    // newline count is valid if search stopped on expected chunk
    return(it == pc_end);
-}
+} // newlines_between
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/newlines.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.h
index 1ecb0d1f..cd5d61db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/newlines.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/newlines.h
@@ -10,7 +10,6 @@
 #define NEWLINES_H_INCLUDED
 
 #include "chunk_list.h"
-#include "uncrustify_types.h"
 
 /**
  * Double the newline, if allowed.
@@ -23,6 +22,13 @@ void double_newline(chunk_t *nl);
  */
 void newlines_remove_newlines(void);
 
+
+/**
+ * Remove all newlines that fail the checks performed by the can_increase_nl() function
+ */
+void newlines_remove_disallowed();
+
+
 /** Step through all chunks, altering newlines inside parens of if/for/while/do as needed.
  * Handles the style options: nl_multi_line_sparen_open, nl_multi_line_sparen_close, nl_before_if_closing_paren
  */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.cpp
index 9ad8912b..6d3f7f34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.cpp
@@ -3,26 +3,23 @@
  * Parses the options from the config file.
  *
  * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
+ * @author  Guy Maurel October 2015, 2021
  * @author  Matthew Woehlke since version 0.67
  * @license GPL v2+
  */
+
 #include "option.h"
 
 #include "keywords.h"
-#include "option_enum.h"
 #include "uncrustify.h"
-#include "uncrustify_limits.h"
-#include "uncrustify_types.h"
 #include "uncrustify_version.h"
 
 #include <fstream>
 #include <unordered_map>
 
-#include <cctype>
-#include <cstdarg>
-#include <cstring>
+#include <cctype>                    // to get std::tolower
+#include <cstdarg>                   // to get va_start, va_end
+
 
 namespace uncrustify
 {
@@ -156,7 +153,9 @@ std::string to_lower(const std::string &in)
 //-----------------------------------------------------------------------------
 bool is_arg_sep(int ch)
 {
-   return(isspace(ch) || ch == ',' || ch == '=');
+   return(  isspace(ch)
+         || ch == ','
+         || ch == '=');
 }
 
 
@@ -179,13 +178,15 @@ std::vector<std::string> split_args(std::string in, const char *filename,
    while (n < k)
    {
       // Skip leading space
-      while (n < k && is_sep(in[n]))
+      while (  n < k
+            && is_sep(in[n]))
       {
          ++n;
       }
 
       // Detect comments or trailing space
-      if (n >= k || in[n] == '#')
+      if (  n >= k
+         || in[n] == '#')
       {
          break;
       }
@@ -197,7 +198,8 @@ std::vector<std::string> split_args(std::string in, const char *filename,
 
          for ((void)n; in[n] != *quote; ++n)
          {
-            if (n < k && in[n] == '\\')
+            if (  n < k
+               && in[n] == '\\')
             {
                in.erase(n, 1);
                --k;
@@ -213,7 +215,8 @@ std::vector<std::string> split_args(std::string in, const char *filename,
 
          out.push_back(in.substr(start, n - start));
 
-         if (++n < k && !is_sep(in[n]))
+         if (  ++n < k
+            && !is_sep(in[n]))
          {
             OptionWarning w{ filename };
             w("unexpected text following quoted-string");
@@ -224,7 +227,10 @@ std::vector<std::string> split_args(std::string in, const char *filename,
       // Extract anything else
       const auto start = n;
 
-      for ((void)n; n < k && !is_sep(in[n]); ++n)
+      for ((void)n;
+           (  n < k
+           && !is_sep(in[n]));
+           ++n)
       {
          if (in[n] == '\\')
          {
@@ -254,14 +260,18 @@ bool is_path_relative(const std::string &path)
 #ifdef WIN32
    // Check for partition labels as indication for an absolute path
    // 'X:\path\to\file' style absolute disk path
-   if (path.size() > 1 && isalpha(path[0]) && path[1] == ':')
+   if (  path.size() > 1
+      && isalpha(path[0])
+      && path[1] == ':')
    {
       return(false);
    }
 
    // Check for double backslashs as indication for a network path
    // '\\server\path\to\file style' absolute UNC path
-   if (path.size() > 1 && path[0] == '\\' && path[1] == '\\')
+   if (  path.size() > 1
+      && path[0] == '\\'
+      && path[1] == '\\')
    {
       return(false);
    }
@@ -279,7 +289,9 @@ void print_description(FILE *pfile, std::string description,
 {
    // Descriptions always start with a '\n', so skip the first character
    for (std::string::size_type start = 1, length = description.length();
-        start != std::string::npos && start < length; ++start)
+        (  start != std::string::npos
+        && start < length);
+        ++start)
    {
       // Check for empty line so we can squelch trailing whitespace
       if (description[start] == '\n')
@@ -462,7 +474,8 @@ bool read_number(const char *in, Option<T> &out)
    char       *c;
    const auto val = std::strtol(in, &c, 10);
 
-   if (*c == 0 && out.validate(val))
+   if (  *c == 0
+      && out.validate(val))
    {
       out.m_val = static_cast<T>(val);
       return(true);
@@ -861,7 +874,8 @@ void process_option_line(const std::string &config_line, const char *filename,
    // Check for necessary arguments
    const auto &cmd = to_lower(args.front());
 
-   if (cmd == "set" || cmd == "file_ext")
+   if (  cmd == "set"
+      || cmd == "file_ext")
    {
       if (args.size() < 3)
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.h
index 4bf4d870..4ab356b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option.h
@@ -66,7 +66,6 @@ enum class iarf_e // <IARF>
    ADD         = (1u << 0),      //! option adds a given feature
    REMOVE      = (1u << 1),      //! option removes a given feature
    FORCE       = (ADD | REMOVE), //! option forces the usage of a given feature
-   // UNC_INTERNAL
    NOT_DEFINED = (1u << 2)       //! for debugging
 };
 
@@ -214,7 +213,8 @@ public:
    BoundedOption(const char *opt_name, const char *opt_desc, T opt_val = T{})
       : Option<T>{opt_name, opt_desc, opt_val}
    {
-      assert(opt_val >= min && opt_val <= max);
+      assert(  opt_val >= min
+            && opt_val <= max);
    }
 
    std::string minStr() const override { return(std::to_string(min)); }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option_enum.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.cpp.in
index aeb976b2..aeb976b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option_enum.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.cpp.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option_enum.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.h.in
index e50a9281..e50a9281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/option_enum.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/option_enum.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.cpp.in
index fcb8395f..2ee14c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.cpp.in
@@ -1,5 +1,4 @@
 ##BANNER##
-#include "options.h"
 
 #include "uncrustify_types.h"
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.h
index 5f199b31..520f45c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options.h
@@ -30,7 +30,6 @@
  * instantiation. Note also that the line break, as shown, is required.
  */
 
-#include "option.h"
 #include "option_enum.h"
 
 namespace uncrustify
@@ -76,18 +75,16 @@ string_replace_tab_chars;
 extern Option<bool>
 tok_split_gte;
 
-// Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+// Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
 extern Option<bool>
 disable_processing_nl_cont;
 
 // Specify the marker used in comments to disable processing of part of the
 // file.
-// The comment should be used alone in one line.
 extern Option<string>
 disable_processing_cmt; // = UNCRUSTIFY_OFF_TEXT
 
 // Specify the marker used in comments to (re)enable processing in a file.
-// The comment should be used alone in one line.
 extern Option<string>
 enable_processing_cmt; // = UNCRUSTIFY_ON_TEXT
 
@@ -95,6 +92,13 @@ enable_processing_cmt; // = UNCRUSTIFY_ON_TEXT
 extern Option<bool>
 enable_digraphs;
 
+// Option to allow both disable_processing_cmt and enable_processing_cmt
+// strings, if specified, to be interpreted as ECMAScript regular expressions.
+// If true, a regex search will be performed within comments according to the
+// specified patterns in order to disable/enable processing.
+extern Option<bool>
+processing_cmt_as_regex;
+
 // Add or remove the UTF-8 BOM (recommend 'remove').
 extern Option<iarf_e>
 utf8_bom;
@@ -108,18 +112,6 @@ utf8_byte;
 extern Option<bool>
 utf8_force;
 
-// Add or remove space between 'do' and '{'.
-extern Option<iarf_e>
-sp_do_brace_open;
-
-// Add or remove space between '}' and 'while'.
-extern Option<iarf_e>
-sp_brace_close_while;
-
-// Add or remove space between 'while' and '('.
-extern Option<iarf_e>
-sp_while_paren_open;
-
 //END
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -156,6 +148,12 @@ sp_cpp_lambda_square_paren;
 extern Option<iarf_e>
 sp_cpp_lambda_square_brace;
 
+// Add or remove space after the opening parenthesis and before the closing
+// parenthesis of a argument list of a C++11 lambda, as in
+// '[]( <here> int x <here> ){ ... }'.
+extern Option<iarf_e>
+sp_cpp_lambda_argument_list;
+
 // Add or remove space after the argument list of a C++11 lambda, as in
 // '[](int x) <here> { ... }'.
 extern Option<iarf_e>
@@ -250,7 +248,7 @@ sp_balance_nested_parens;
 extern Option<iarf_e>
 sp_paren_brace;
 
-// Add or remove space between nested braces, i.e. '{{' vs '{ {'.
+// Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
 extern Option<iarf_e>
 sp_brace_brace;
 
@@ -337,9 +335,8 @@ sp_before_byref_func;
 extern Option<iarf_e>
 sp_after_type; // = IARF_FORCE
 
-// Add or remove space between 'decltype(...)' and word.
-//
-// Overrides sp_after_type.
+// Add or remove space between 'decltype(...)' and word,
+// brace or function call.
 extern Option<iarf_e>
 sp_after_decltype;
 
@@ -424,6 +421,18 @@ sp_after_sparen;
 extern Option<iarf_e>
 sp_sparen_brace;
 
+// Add or remove space between 'do' and '{'.
+extern Option<iarf_e>
+sp_do_brace_open;
+
+// Add or remove space between '}' and 'while'.
+extern Option<iarf_e>
+sp_brace_close_while;
+
+// Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+extern Option<iarf_e>
+sp_while_paren_open;
+
 // (D) Add or remove space between 'invariant' and '('.
 extern Option<iarf_e>
 sp_invariant_paren;
@@ -1068,31 +1077,39 @@ extern Option<iarf_e>
 sp_range;
 
 // Add or remove space after ':' in a Java/C++11 range-based 'for',
-// as in 'for (Type var : expr)'.
+// as in 'for (Type var : <here> expr)'.
 extern Option<iarf_e>
 sp_after_for_colon;
 
 // Add or remove space before ':' in a Java/C++11 range-based 'for',
-// as in 'for (Type var : expr)'.
+// as in 'for (Type var <here> : expr)'.
 extern Option<iarf_e>
 sp_before_for_colon;
 
-// (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
+// (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
 extern Option<iarf_e>
 sp_extern_paren;
 
-// Add or remove space after the opening of a C++ comment,
-// i.e. '// A' vs. '//A'.
+// Add or remove space after the opening of a C++ comment, as in '// <here> A'.
 extern Option<iarf_e>
 sp_cmt_cpp_start;
 
-// If true, space is added with sp_cmt_cpp_start will be added after doxygen
+// Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+// A region marker is defined as a comment which is not preceded by other text
+// (i.e. the comment is the first non-whitespace on the line), and which starts
+// with either 'BEGIN' or 'END'.
+//
+// Overrides sp_cmt_cpp_start.
+extern Option<iarf_e>
+sp_cmt_cpp_region;
+
+// If true, space added with sp_cmt_cpp_start will be added after Doxygen
 // sequences like '///', '///<', '//!' and '//!<'.
 extern Option<bool>
 sp_cmt_cpp_doxygen;
 
-// If true, space is added with sp_cmt_cpp_start will be added after Qt
-// translator or meta-data comments like '//:', '//=', and '//~'.
+// If true, space added with sp_cmt_cpp_start will be added after Qt translator
+// or meta-data comments like '//:', '//=', and '//~'.
 extern Option<bool>
 sp_cmt_cpp_qttr;
 
@@ -1279,6 +1296,13 @@ indent_extern;
 extern Option<bool>
 indent_class;
 
+// Additional indent before the leading base class colon.
+// Negative values decrease indent down to the first column.
+// Requires a newline break before colon (see pos_class_colon
+// and nl_class_colon)
+extern BoundedOption<signed, -16, 16>
+indent_before_class_colon;
+
 // Whether to indent the stuff after a leading base class colon.
 extern Option<bool>
 indent_class_colon;
@@ -1412,12 +1436,19 @@ extern Option<bool>
 indent_relative_single_line_comments;
 
 // Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+// It might wise to choose the same value for the option indent_case_brace.
 extern BoundedOption<unsigned, 0, 16>
 indent_switch_case;
 
+// 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.
+// It might wise to choose the same value for the option indent_switch_case.
+extern BoundedOption<signed, -16, 16>
+indent_case_brace;
+
 // indent 'break' with 'case' from 'switch'.
 extern Option<bool>
-indent_switch_break_with_case; // = false
+indent_switch_break_with_case;
 
 // Whether to indent preprocessor statements inside of switch statements.
 extern Option<bool>
@@ -1428,11 +1459,6 @@ indent_switch_pp; // = true
 extern BoundedOption<unsigned, 0, 16>
 indent_case_shift;
 
-// 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.
-extern BoundedOption<signed, -16, 16>
-indent_case_brace;
-
 // Whether to indent comments found in first column.
 extern Option<bool>
 indent_col1_comment;
@@ -1489,6 +1515,11 @@ indent_paren_after_func_decl;
 extern Option<bool>
 indent_paren_after_func_call;
 
+// Whether to indent a comma when inside a brace.
+// If true, aligns under the open brace.
+extern Option<bool>
+indent_comma_brace;
+
 // Whether to indent a comma when inside a parenthesis.
 // If true, aligns under the open parenthesis.
 extern Option<bool>
@@ -1531,7 +1562,7 @@ indent_align_assign; // = true
 // If true, the indentation of the chunks after a '=' sequence will be set at
 // LHS token indentation column before '='.
 extern Option<bool>
-indent_off_after_assign; // = false
+indent_off_after_assign;
 
 // Whether to align continued statements at the '('. If false or the '(' is
 // followed by a newline, the next line indent is one tab.
@@ -1540,7 +1571,7 @@ indent_align_paren; // = true
 
 // (OC) Whether to indent Objective-C code inside message selectors.
 extern Option<bool>
-indent_oc_inside_msg_sel; // = false
+indent_oc_inside_msg_sel;
 
 // (OC) Whether to indent Objective-C blocks at brace level instead of usual
 // rules.
@@ -1611,10 +1642,10 @@ extern Option<bool>
 indent_cpp_lambda_body;
 
 // How to indent compound literals that are being returned.
-// true: add both the indent from return & the compound literal open brace (ie:
-//       2 indent levels)
-// false: only indent 1 level, don't add the indent for the open brace, only add
-//        the indent for the return.
+// true: add both the indent from return & the compound literal open brace
+//       (i.e. 2 indent levels)
+// false: only indent 1 level, don't add the indent for the open brace, only
+//        add the indent for the return.
 extern Option<bool>
 indent_compound_literal_return; // = true
 
@@ -1630,9 +1661,9 @@ indent_using_block; // = true
 extern BoundedOption<unsigned, 0, 2>
 indent_ternary_operator;
 
-// Whether to indent the statments inside ternary operator.
+// Whether to indent the statements inside ternary operator.
 extern Option<bool>
-indent_inside_ternary_operator; // false
+indent_inside_ternary_operator;
 
 // If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
 extern Option<bool>
@@ -1703,6 +1734,10 @@ nl_if_leave_one_liners;
 extern Option<bool>
 nl_while_leave_one_liners;
 
+// Don't split one-line do statements, as in 'do { b++; } while(...);'.
+extern Option<bool>
+nl_do_leave_one_liners;
+
 // Don't split one-line for statements, as in 'for(...) b++;'.
 extern Option<bool>
 nl_for_leave_one_liners;
@@ -2222,7 +2257,7 @@ nl_func_call_args_multi_line;
 extern Option<bool>
 nl_func_call_end_multi_line;
 
-// Whether to respect nl_func_call_XXX option incase of closure args.
+// Whether to respect nl_func_call_XXX option in case of closure args.
 extern Option<bool>
 nl_func_call_args_multi_line_ignore_closures; // false
 
@@ -2452,9 +2487,8 @@ nl_create_while_one_liner;
 extern Option<bool>
 nl_create_func_def_one_liner;
 
-// 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.
+// Whether to split one-line simple unbraced if statements into three lines by
+// adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 extern Option<bool>
 nl_create_list_one_liner;
 
@@ -2492,7 +2526,9 @@ extern BoundedOption<unsigned, 0, 16>
 nl_max_blank_in_func;
 
 // The number of newlines inside an empty function body.
-// This option is overridden by nl_collapse_empty_body=true
+// This option overrides eat_blanks_after_open_brace and
+// eat_blanks_before_close_brace, but is ignored when
+// nl_collapse_empty_body=true
 extern BoundedOption<unsigned, 0, 16>
 nl_inside_empty_func;
 
@@ -2500,7 +2536,8 @@ nl_inside_empty_func;
 extern BoundedOption<unsigned, 0, 16>
 nl_before_func_body_proto;
 
-// The number of newlines before a multi-line function definition.
+// The number of newlines before a multi-line function definition. Where
+// applicable, this option is overridden with eat_blanks_after_open_brace=true
 extern BoundedOption<unsigned, 0, 16>
 nl_before_func_body_def;
 
@@ -3233,10 +3270,47 @@ cmt_width;
 //
 // 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
 // 1: No touching at all
-// 2: Full reflow
+// 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
 extern BoundedOption<unsigned, 0, 2>
 cmt_reflow_mode;
 
+// Path to a file that contains regular expressions describing patterns for
+// which the end of one line and the beginning of the next will be folded into
+// the same sentence or paragraph during full comment reflow. The regular
+// expressions are described using ECMAScript syntax. The syntax for this
+// specification is as follows, where "..." indicates the custom regular
+// expression and "n" indicates the nth end_of_prev_line_regex and
+// beg_of_next_line_regex regular expression pair:
+//
+// end_of_prev_line_regex[1] = "...$"
+// beg_of_next_line_regex[1] = "^..."
+// end_of_prev_line_regex[2] = "...$"
+// beg_of_next_line_regex[2] = "^..."
+//             .
+//             .
+//             .
+// end_of_prev_line_regex[n] = "...$"
+// beg_of_next_line_regex[n] = "^..."
+//
+// Note that use of this option overrides the default reflow fold regular
+// expressions, which are internally defined as follows:
+//
+// end_of_prev_line_regex[1] = "[\w,\]\)]$"
+// beg_of_next_line_regex[1] = "^[\w,\[\(]"
+// end_of_prev_line_regex[2] = "\.$"
+// beg_of_next_line_regex[2] = "^[A-Z]"
+extern Option<string>
+cmt_reflow_fold_regex_file;
+
+// Whether to indent wrapped lines to the start of the encompassing paragraph
+// during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+// specified by cmt_sp_after_star_cont.
+//
+// Note that cmt_align_doxygen_javadoc_tags overrides this option for
+// paragraphs associated with javadoc tags
+extern Option<bool>
+cmt_reflow_indent_to_paragraph_start;
+
 // Whether to convert all tabs to spaces in comments. If false, tabs in
 // comments are left alone, unless used for indenting.
 extern Option<bool>
@@ -3249,6 +3323,22 @@ cmt_convert_tab_to_spaces;
 extern Option<bool>
 cmt_indent_multi; // = true
 
+// Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+// and corresponding fields such that groups of consecutive block tags,
+// parameter names, and descriptions align with one another. Overrides that
+// which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+// be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+// in order to achieve the desired alignment for line-wrapping.
+extern Option<bool>
+cmt_align_doxygen_javadoc_tags;
+
+// The number of spaces to insert after the star and before doxygen
+// javadoc-style tags (@param, @return, etc). Requires enabling
+// cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+// cmt_sp_after_star_cont.
+extern BoundedOption<unsigned, 0, 16>
+cmt_sp_before_doxygen_javadoc_tags; // = 1
+
 // Whether to group c-comments that look like they are in a block.
 extern Option<bool>
 cmt_c_group;
@@ -3740,9 +3830,8 @@ use_sp_after_angle_always;
 extern Option<bool>
 use_options_overriding_for_qt_macros; // = true
 
-// If true: the form feed character is removed from the list
-// of whitespace characters.
-// See https://en.cppreference.com/w/cpp/string/byte/isspace
+// If true: the form feed character is removed from the list of whitespace
+// characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
 extern Option<bool>
 use_form_feed_no_more_as_whitespace_character;
 
@@ -3776,6 +3865,11 @@ debug_line_number_to_protocol;
 extern Option<signed>
 debug_timeout;
 
+// Set the number of characters to be printed if the text is too long,
+// 0: do not truncate.
+extern BoundedOption<unsigned, 0, 960>
+debug_truncate;
+
 //END
 
 } // namespace options
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options_for_QT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.cpp
index 6aec1062..f4a1d040 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options_for_QT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.cpp
@@ -13,6 +13,8 @@
 
 #include "log_rules.h"
 
+constexpr static auto LCURRENT = LQT;
+
 using namespace uncrustify;
 
 // for the modification of options within the SIGNAL/SLOT call.
@@ -40,7 +42,7 @@ private:
    Option<iarf_e> *m_option;
    const iarf_e   m_override_value;
 
-   iarf_e         m_saved_value = iarf_e::NOT_DEFINED;
+   iarf_e         m_saved_value = IARF_NOT_DEFINED;
 };
 
 
@@ -56,7 +58,7 @@ void temporary_iarf_option::save_and_override()
 void temporary_iarf_option::restore()
 {
    (*m_option)   = m_saved_value;
-   m_saved_value = iarf_e::NOT_DEFINED;
+   m_saved_value = IARF_NOT_DEFINED;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options_for_QT.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.h
index c114eb75..c114eb75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/options_for_QT.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/options_for_QT.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.cpp
index db135c0f..fd60ebab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.cpp
@@ -3,8 +3,7 @@
  * Does all the output & comment formatting.
  *
  * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
+ * @author  Guy Maurel October 2015, 2021
  * @license GPL v2+
  */
 
@@ -12,33 +11,35 @@
 
 #include "align_tab_column.h"
 #include "braces.h"
-#include "chunk_list.h"
-#include "error_types.h"
 #include "indent.h"
-#include "language_tools.h"
-#include "log_rules.h"
 #include "prototypes.h"
+#include "tokenize.h"
 #include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 #include "unicode.h"
 
-#include <cstdlib>
+#include <regex>
+#include <set>
 
+#ifdef WIN32
+#include <map>                    // to get std::map
+#endif // WIN32
+
+
+constexpr static auto LCURRENT = LOUTPUT;
 
 using namespace uncrustify;
 
 
 struct cmt_reflow
 {
-   chunk_t  *pc;
-   size_t   column;        //! Column of the comment start
-   size_t   brace_col;     //! Brace column (for indenting with tabs)
-   size_t   base_col;      //! Base column (for indenting with tabs)
-   size_t   word_count;    //! number of words on this line
-   size_t   xtra_indent;   //! extra indent of non-first lines (0 or 1)
-   unc_text cont_text;     //! fixed text to output at the start of a line (0 to 3 chars)
-   bool     reflow;        //! reflow the current line
+   chunk_t  *pc         = nullptr;
+   size_t   column      = 0;   //! Column of the comment start
+   size_t   brace_col   = 0;   //! Brace column (for indenting with tabs)
+   size_t   base_col    = 0;   //! Base column (for indenting with tabs)
+   size_t   word_count  = 0;   //! number of words on this line
+   size_t   xtra_indent = 0;   //! extra indent of non-first lines (0 or 1)
+   unc_text cont_text;         //! fixed text to output at the start of a line (0 to 3 chars)
+   bool     reflow = false;    //! reflow the current line
 };
 
 
@@ -213,7 +214,7 @@ static void cmt_trim_whitespace(unc_text &line, bool in_preproc);
  * If the last char on a line is a ':' or '.', then the next line won't be
  * combined.
  */
-static void add_comment_text(const unc_text &text, cmt_reflow &cmt, bool esc_close);
+static void add_comment_text(const unc_text &text, cmt_reflow &cmt, bool esc_close, size_t continuation_indent = 0);
 
 
 static void output_cmt_start(cmt_reflow &cmt, chunk_t *pc);
@@ -246,7 +247,8 @@ static void add_spaces()
 static void add_char(UINT32 ch, bool is_literal)
 {
    // If we did a '\r' and it isn't followed by a '\n', then output a newline
-   if ((cpd.last_char == '\r') && (ch != '\n'))
+   if (  (cpd.last_char == '\r')
+      && (ch != '\n'))
    {
       write_string(cpd.newline);
       cpd.column      = 1;
@@ -270,7 +272,8 @@ static void add_char(UINT32 ch, bool is_literal)
       cpd.did_newline = 1;
       cpd.spaces      = 0;
    }
-   else if ((ch == '\t') && cpd.output_tab_as_space)
+   else if (  (ch == '\t')
+           && cpd.output_tab_as_space)
    {
       size_t endcol = next_tab_column(cpd.column);
 
@@ -283,7 +286,9 @@ static void add_char(UINT32 ch, bool is_literal)
    else
    {
       // explicitly disallow a tab after a space
-      if (!is_literal && ch == '\t' && cpd.last_char == ' ')
+      if (  !is_literal
+         && ch == '\t'
+         && cpd.last_char == ' ')
       {
          log_rule_B("indent_with_tabs");
 
@@ -299,7 +304,8 @@ static void add_char(UINT32 ch, bool is_literal)
          }
       }
 
-      if ((ch == ' ') && !cpd.output_trailspace)
+      if (  (ch == ' ')
+         && !cpd.output_trailspace)
       {
          cpd.spaces++;
          cpd.column++;
@@ -355,22 +361,25 @@ static void add_text(const unc_text &text, bool is_ignored = false, bool is_lite
 
 static bool next_word_exceeds_limit(const unc_text &text, size_t idx)
 {
+   LOG_FMT(LCONTTEXT, "%s(%d): idx is %zu\n",
+           __func__, __LINE__, idx);
    size_t length = 0;
 
    // Count any whitespace
-   while ((idx < text.size()) && unc_isspace(text[idx]))
+   while (  (idx < text.size())
+         && unc_isspace(text[idx]))
    {
       idx++;
       length++;
    }
 
    // Count non-whitespace
-   while ((idx < text.size()) && !unc_isspace(text[idx]))
+   while (  (idx < text.size())
+         && !unc_isspace(text[idx]))
    {
       idx++;
       length++;
    }
-   log_rule_B("cmt_width");
    return((cpd.column + length - 1) > options::cmt_width());
 }
 
@@ -420,7 +429,8 @@ static void cmt_output_indent(size_t brace_col, size_t base_col, size_t column)
    cpd.did_newline = 0;
 
    if (  iwt == 2
-      || (cpd.column == 1 && iwt == 1))
+      || (  cpd.column == 1
+         && iwt == 1))
    {
       // tab out as far as possible and then use spaces
       while (next_tab_column(cpd.column) <= tab_col)
@@ -478,7 +488,8 @@ void output_parsed(FILE *pfile)
               pc->nl_count, pc->after_tab);
 #endif // ifdef WIN32
 
-      if (pc->type != CT_NEWLINE && (pc->len() != 0))
+      if (  pc->type != CT_NEWLINE
+         && (pc->len() != 0))
       {
          for (size_t cnt = 0; cnt < pc->column; cnt++)
          {
@@ -531,7 +542,8 @@ void output_parsed_csv(FILE *pfile)
       fprintf(pfile, "%zu,%d,",
               pc->nl_count, pc->after_tab);
 
-      if (pc->type != CT_NEWLINE && (pc->len() != 0))
+      if (  pc->type != CT_NEWLINE
+         && (pc->len() != 0))
       {
          fprintf(pfile, "\"");
 
@@ -544,11 +556,7 @@ void output_parsed_csv(FILE *pfile)
          {
             for (auto *ch = pc->text(); *ch != '\0'; ++ch)
             {
-               if (  *ch > 0
-                  || !chunk_is_token(pc, CT_COMMENT_MULTI))
-               {
-                  fprintf(pfile, "%c", *ch);
-               }
+               fprintf(pfile, "%c", *ch);
 
                if (*ch == '"')
                {
@@ -571,6 +579,8 @@ void output_parsed_csv(FILE *pfile)
 
 void output_text(FILE *pfile)
 {
+   bool tracking = cpd.html_file != nullptr;                 // special for debugging
+
    cpd.fout        = pfile;
    cpd.did_newline = 1;
    cpd.column      = 1;
@@ -595,11 +605,26 @@ void output_text(FILE *pfile)
       cpd.frag_cols = 0;
    }
 
+   if (tracking)
+   {
+      add_text("<html>\n");
+      add_text("<head>\n");
+      add_text("   <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/>\n");
+      add_text("   <title>Uncrustify: where do the Spaces options work</title>\n");
+      add_text("</head>\n");
+      add_text("<body lang=\"en-US\">\n");
+      add_text("<p>\n");
+      add_text("</p>\n");
+      add_text("<pre>\n");
+   }
+   bool write_in_tracking = false;
+
    // loop over the whole chunk list
    for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
    {
-      LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s', type is %s, orig_col is %zu, column is %zu, nl is %zu\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column, pc->nl_count);
+      char copy[1000];
+      LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s', type is %s, orig_line is %zu, column is %zu, nl is %zu\n",
+              __func__, __LINE__, pc->elided_text(copy), get_token_name(pc->type), pc->orig_line, pc->column, pc->nl_count);
       log_rule_B("cmt_convert_tab_to_spaces");
       cpd.output_tab_as_space = (  options::cmt_convert_tab_to_spaces()
                                 && chunk_is_comment(pc));
@@ -608,7 +633,8 @@ void output_text(FILE *pfile)
       {
          for (size_t cnt = 0; cnt < pc->nl_count; cnt++)
          {
-            if (cnt > 0 && pc->nl_column > 1)
+            if (  cnt > 0
+               && pc->nl_column > 1)
             {
                log_rule_B("indent_with_tabs");
                output_to_column(pc->nl_column, (options::indent_with_tabs() == 2));
@@ -650,14 +676,15 @@ void output_text(FILE *pfile)
                else
                {
                   // Try to keep the same relative spacing
-                  while (  prev != NULL
+                  while (  prev != nullptr
                         && prev->orig_col == 0
                         && prev->nl_count == 0)
                   {
                      prev = chunk_get_prev(prev);
                   }
 
-                  if (prev != NULL && prev->nl_count == 0)
+                  if (  prev != nullptr
+                     && prev->nl_count == 0)
                   {
                      int orig_sp = (pc->orig_col - prev->orig_col_end);
 
@@ -728,7 +755,8 @@ void output_text(FILE *pfile)
       {
          pc = output_comment_c(pc);
       }
-      else if (chunk_is_token(pc, CT_JUNK) || chunk_is_token(pc, CT_IGNORED))
+      else if (  chunk_is_token(pc, CT_JUNK)
+              || chunk_is_token(pc, CT_IGNORED))
       {
          LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, orig_col is %zu,\npc->text() >%s<, pc->str.size() is %zu\n",
                  __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), pc->str.size());
@@ -817,10 +845,31 @@ void output_text(FILE *pfile)
                     __func__, __LINE__, pc->column, (allow_tabs ? "true" : "FALSE"));
          }
          output_to_column(pc->column, allow_tabs);
-         add_text(pc->str, false, chunk_is_token(pc, CT_STRING));
+
+         if (write_in_tracking)
+         {
+            if (chunk_is_token(pc, CT_ANGLE_OPEN))
+            {
+               add_text("&lt;", false, false);
+            }
+            else if (chunk_is_token(pc, CT_ANGLE_CLOSE))
+            {
+               add_text("&gt;", false, false);
+            }
+            else
+            {
+               add_text(pc->str, false, chunk_is_token(pc, CT_STRING));
+            }
+            write_in_tracking = false;
+         }
+         else
+         {
+            add_text(pc->str, false, chunk_is_token(pc, CT_STRING));
+         }
 
          if (chunk_is_token(pc, CT_PP_DEFINE))  // Issue #876
          {
+            // If true, a <TAB> is inserted after #define.
             log_rule_B("force_tab_after_define");
 
             if (options::force_tab_after_define())
@@ -831,6 +880,44 @@ void output_text(FILE *pfile)
          cpd.did_newline       = chunk_is_newline(pc);
          cpd.output_trailspace = false;
       }
+
+      if (pc->tracking != nullptr)
+      {
+         LOG_FMT(LGUY, " Tracking info are: \n");
+         LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->tracking->size());
+         add_text("<a title=\"");
+         char tempText[80];
+
+         for (size_t track = 0; track < pc->tracking->size(); track++)
+         {
+            track_list *A       = pc->tracking;
+            Track_nr   B        = A->at(track);
+            size_t     Bfirst   = B.first;
+            char       *Bsecond = B.second;
+
+            sprintf(tempText, "%zu", Bfirst);
+            add_text(tempText);
+            add_text(",");
+
+            if (track == pc->tracking->size() - 1)
+            {
+               sprintf(tempText, "%s", Bsecond);
+               add_text(tempText);
+            }
+            LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
+            LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
+         }
+
+         add_text("\"><font color=\"red\">M</font></a>");
+         write_in_tracking = true;
+      }
+   }
+
+   if (tracking)
+   {
+      add_text("</pre>\n");
+      add_text("</body>\n");
+      add_text("</html>\n");
    }
 } // output_text
 
@@ -839,19 +926,23 @@ static size_t cmt_parse_lead(const unc_text &line, bool is_last)
 {
    size_t len = 0;
 
-   while (len < 32 && len < line.size())  // TODO what is the meaning of 32?
+   while (  len < 32
+         && len < line.size()) // TODO what is the meaning of 32?
    {
-      if (len > 0 && line[len] == '/')
+      if (  len > 0
+         && line[len] == '/')
       {
          // ignore combined comments
          size_t tmp = len + 1;
 
-         while (tmp < line.size() && unc_isspace(line[tmp]))
+         while (  tmp < line.size()
+               && unc_isspace(line[tmp]))
          {
             tmp++;
          }
 
-         if (tmp < line.size() && line[tmp] == '/')
+         if (  tmp < line.size()
+            && line[tmp] == '/')
          {
             return(1);
          }
@@ -870,17 +961,20 @@ static size_t cmt_parse_lead(const unc_text &line, bool is_last)
    }
 
    if (  len > 0
-      && (len >= line.size() || unc_isspace(line[len])))
+      && (  len >= line.size()
+         || unc_isspace(line[len])))
    {
       return(len);
    }
 
-   if (len == 1 && line[0] == '*')
+   if (  len == 1
+      && line[0] == '*')
    {
       return(len);
    }
 
-   if (is_last && len > 0)
+   if (  is_last
+      && len > 0)
    {
       return(len);
    }
@@ -888,6 +982,216 @@ static size_t cmt_parse_lead(const unc_text &line, bool is_last)
 } // cmt_parse_lead
 
 
+/**
+ * Eat whitespace characters starting at the specified index in the forward or reverse direction
+ * within a single line
+ * @param  str     the input string containing the comment text
+ * @param  idx     the starting index
+ * @param  forward if true, searches in the forward direction;
+ *                 if false, searches in the reverse direction
+ * @return         the first index at which a non-whitespace character is encountered, including
+ *                 a newline character
+ */
+template<typename String>
+static int eat_line_whitespace(const String &str,
+                               int idx, bool
+                               forward = true)
+{
+   auto advance_index = [&](int i)
+   {
+      return(forward ? i + 1 : i - 1);
+   };
+
+   auto index_in_range = [&](int i)
+   {
+      // TODO: the following BREAKS with source code formatting; uncrustify seems to
+      //       think that the following is a template. This will NEED to be fixed!!!
+      //       For now, reformulate the statement
+      //return(forward ? i<int(str.size()) : i> = 0);
+      return(forward ? (i < int(str.size())) : (i >= 0));
+   };
+
+   while (  index_in_range(idx)
+         && str[idx] != '\n'
+         && str[idx] != '\r'
+         && unc_isspace(str[idx]))
+   {
+      idx = advance_index(idx);
+   }
+   return(idx);
+} // eat_line_whitespace
+
+
+/**
+ * Returns whether or not a javaparam tag is the leading
+ * text in a comment line, with only a sequence of whitespace
+ * and/or '*' characters preceding it
+ * @param  str the input string containing the comment text
+ * @param  idx the starting index
+ * @return     true/false
+ */
+template<typename String>
+static bool javaparam_tag_is_start_of_line(const String &str, int idx)
+{
+   idx = eat_line_whitespace(str,
+                             str[idx] == '@' ? idx - 1 : idx,
+                             false);
+
+   while (true)
+   {
+      if (  idx < 0
+         || str[idx] == '\n'
+         || str[idx] == '\r')
+      {
+         return(true);
+      }
+
+      if (str[idx] == '*')
+      {
+         idx = eat_line_whitespace(str,
+                                   idx - 1,
+                                   false);
+      }
+      else
+      {
+         return(false);
+      }
+   }
+} // javaparam_tag_is_start_of_line
+
+
+/**
+ * Attempts to match a doxygen/javadoc-style comment tag
+ * @param  str the input string containing the comment text
+ * @param  idx the starting index
+ * @return     the index of the character immediately following the matched tag,
+ *             or -1 if no match is found
+ */
+static int match_doxygen_javadoc_tag(const std::wstring &str, size_t idx)
+{
+   std::wsmatch match;
+
+   if (str[idx] == L'@')
+   {
+      std::wregex criteria(L"(@(?:author|"
+                           L"deprecated|"
+                           L"exception|"
+                           L"param(?:\\s*\\[\\s*(?:in\\s*,\\s*out|in|out)\\s*\\])?|"
+                           L"return|"
+                           L"see|"
+                           L"since|"
+                           L"throws|"
+                           L"version)\\b)");
+
+      if (  std::regex_search(str.cbegin() + idx, str.cend(), match, criteria)
+         && match[1].matched
+         && match.position(1) == std::wsmatch::difference_type(0))
+      {
+         std::set<std::wstring> block_tags =
+         {
+            L"@author",
+            L"@deprecated",
+            L"@exception",
+            L"@param",
+            L"@param[in]",
+            L"@param[in,out]",
+            L"@param[out]",
+            L"@return",
+            L"@see",
+            L"@since",
+            L"@throws",
+            L"@version"
+         };
+         std::wstring           result(match[1]);
+         result.erase(std::remove_if(result.begin(), result.end(), ::isspace), result.end());
+         auto                   &&it_block_tag = block_tags.find(result);
+
+         if (  it_block_tag != block_tags.end()
+            && javaparam_tag_is_start_of_line(str, idx))
+         {
+            return(int(idx + match[1].length()));
+         }
+      }
+   }
+   return(-1);
+} // match_javadoc_block_tag
+
+
+static void calculate_doxygen_javadoc_indent_alignment(const std::wstring &str,
+                                                       size_t             &doxygen_javadoc_param_name_indent,
+                                                       size_t             &doxygen_javadoc_continuation_indent)
+{
+   log_rule_B("cmt_align_doxygen_javadoc_tags");
+
+   doxygen_javadoc_continuation_indent = 0;
+   doxygen_javadoc_param_name_indent   = 0;
+
+   if (!options::cmt_align_doxygen_javadoc_tags())
+   {
+      return;
+   }
+
+   for (size_t idx = 0; idx < str.size(); ++idx)
+   {
+      int start_idx = idx;
+      int end_idx   = match_doxygen_javadoc_tag(str, start_idx);
+
+      if (end_idx > start_idx)
+      {
+         size_t block_tag_width = 1 + std::count_if(str.begin() + start_idx,
+                                                    str.begin() + end_idx,
+                                                    [](wchar_t ch) {
+            return(!unc_isspace(ch));
+         });
+
+         if (block_tag_width > doxygen_javadoc_param_name_indent)
+         {
+            doxygen_javadoc_param_name_indent = block_tag_width;
+         }
+         idx = eat_line_whitespace(str, end_idx);
+
+         size_t param_name_width = 0;
+
+         if (str.find(L"@param", start_idx) == size_t(start_idx))
+         {
+            param_name_width = 1;
+
+            while (true)
+            {
+               while (  !unc_isspace(str[idx])
+                     && str[idx] != ',')
+               {
+                  ++param_name_width;
+                  ++idx;
+               }
+               idx = eat_line_whitespace(str, idx);
+
+               if (str[idx] != ',')
+               {
+                  break;
+               }
+               param_name_width += 2;
+               idx               = eat_line_whitespace(str, idx + 1);
+            }
+         }
+
+         if (param_name_width > doxygen_javadoc_continuation_indent)
+         {
+            doxygen_javadoc_continuation_indent = param_name_width;
+         }
+      }
+   }
+
+   if (doxygen_javadoc_param_name_indent > 0)
+   {
+      log_rule_B("cmt_sp_before_doxygen_javadoc_tags");
+
+      doxygen_javadoc_param_name_indent   += options::cmt_sp_before_doxygen_javadoc_tags();
+      doxygen_javadoc_continuation_indent += doxygen_javadoc_param_name_indent;
+   }
+} // calculate_doxygen_javadoc_indent_alignment
+
+
 static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
 {
    cmt.xtra_indent = 0;
@@ -909,12 +1213,14 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
       // find the last line length
       for (idx = len - 1; idx > 0; idx--)
       {
-         if (str[idx] == '\n' || str[idx] == '\r')
+         if (  str[idx] == '\n'
+            || str[idx] == '\r')
          {
             idx++;
 
             while (  idx < len
-                  && (str[idx] == ' ' || str[idx] == '\t'))
+                  && (  str[idx] == ' '
+                     || str[idx] == '\t'))
             {
                idx++;
             }
@@ -928,11 +1234,13 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
 
    for (idx = 0; idx < len; idx++)
    {
-      if (str[idx] == '\n' || str[idx] == '\r')
+      if (  str[idx] == '\n'
+         || str[idx] == '\r')
       {
          first_len = idx;
 
-         while (str[first_len - 1] == ' ' || str[first_len - 1] == '\t')
+         while (  str[first_len - 1] == ' '
+               || str[first_len - 1] == '\t')
          {
             if (first_len == 0)
             {
@@ -945,7 +1253,8 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
          }
 
          // handle DOS endings
-         if (str[idx] == '\r' && str[idx + 1] == '\n')
+         if (  str[idx] == '\r'
+            && str[idx + 1] == '\n')
          {
             idx++;
          }
@@ -959,7 +1268,8 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
 
    for ( ; idx < len - 1; idx++)
    {
-      if (str[idx] == ' ' || str[idx] == '\t')
+      if (  str[idx] == ' '
+         || str[idx] == '\t')
       {
          if (width > 0)
          {
@@ -968,7 +1278,8 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
          continue;
       }
 
-      if (str[idx] == '\n' || str[idx] == '\r')
+      if (  str[idx] == '\n'
+         || str[idx] == '\r')
       {
          break;  // Done with second line
       }
@@ -984,7 +1295,8 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
       }
       else
       {
-         if (width != 1 || str[idx - 1] != '*')
+         if (  width != 1
+            || str[idx - 1] != '*')
          {
             width = 0;
          }
@@ -1058,7 +1370,8 @@ static int next_up(const unc_text &text, size_t idx, unc_text &tag)
 {
    size_t offs = 0;
 
-   while (idx < text.size() && unc_isspace(text[idx]))
+   while (  idx < text.size()
+         && unc_isspace(text[idx]))
    {
       idx++;
       offs++;
@@ -1073,7 +1386,9 @@ static int next_up(const unc_text &text, size_t idx, unc_text &tag)
 
 
 static void add_comment_text(const unc_text &text,
-                             cmt_reflow &cmt, bool esc_close)
+                             cmt_reflow     &cmt,
+                             bool           esc_close,
+                             size_t         continuation_indent)
 {
    bool   was_star  = false;
    bool   was_slash = false;
@@ -1125,7 +1440,8 @@ static void add_comment_text(const unc_text &text,
               && text[idx] == ' '
               && options::cmt_width() > 0
               && (  cpd.column > options::cmt_width()
-                 || (ch_cnt > 1 && next_word_exceeds_limit(text, idx))))
+                 || (  ch_cnt > 1
+                    && next_word_exceeds_limit(text, idx))))
       {
          log_rule_B("cmt_width");
          in_word = false;
@@ -1136,10 +1452,63 @@ static void add_comment_text(const unc_text &text,
          {
             add_char(' ');
          }
-         add_text(cmt.cont_text);
          // The number of spaces to insert after the star on subsequent comment lines.
          log_rule_B("cmt_sp_after_star_cont");
-         output_to_column(cmt.column + options::cmt_sp_after_star_cont(),
+
+         /**
+          * calculate the output column
+          */
+         size_t column = options::cmt_sp_after_star_cont();
+
+         if (  text[idx + 1] == 42                 // this is star *
+            && text[idx + 2] == 47)                // this is      /
+         {
+            LOG_FMT(LCONTTEXT, "%s(%d): we have a comment end\n",
+                    __func__, __LINE__);
+
+            column += cmt.column;
+         }
+         else
+         {
+            add_text(cmt.cont_text);
+
+            if (continuation_indent > 0)
+            {
+               if (options::cmt_align_doxygen_javadoc_tags())
+               {
+                  log_rule_B("cmt_align_doxygen_javadoc_tags");
+               }
+               else if (options::cmt_reflow_indent_to_paragraph_start())
+               {
+                  log_rule_B("cmt_reflow_indent_to_paragraph_start");
+               }
+               column += continuation_indent;
+
+               log_rule_B("cmt_sp_after_star_cont");
+
+               if (column >= options::cmt_sp_after_star_cont())
+               {
+                  column -= options::cmt_sp_after_star_cont();
+               }
+            }
+            /**
+             * count the number trailing spaces in the comment continuation text
+             */
+            size_t num_trailing_sp = 0;
+
+            while (  num_trailing_sp < cmt.cont_text.size()
+                  && unc_isspace(cmt.cont_text[cmt.cont_text.size() - 1 - num_trailing_sp]))
+            {
+               ++num_trailing_sp;
+            }
+            column += cpd.column;
+
+            if (column >= num_trailing_sp)
+            {
+               column -= num_trailing_sp;
+            }
+         }
+         output_to_column(column,
                           false);
          ch_cnt = 0;
       }
@@ -1147,13 +1516,16 @@ static void add_comment_text(const unc_text &text,
       {
          // Escape a C closure in a CPP comment
          if (  esc_close
-            && (  (was_star && text[idx] == '/')
-               || (was_slash && text[idx] == '*')))
+            && (  (  was_star
+                  && text[idx] == '/')
+               || (  was_slash
+                  && text[idx] == '*')))
          {
             add_char(' ');
          }
 
-         if (!in_word && !unc_isspace(text[idx]))
+         if (  !in_word
+            && !unc_isspace(text[idx]))
          {
             cmt.word_count++;
          }
@@ -1255,15 +1627,19 @@ static bool can_combine_comment(chunk_t *pc, cmt_reflow &cmt)
    // next is a newline for sure, make sure it is a single newline
    chunk_t *next = chunk_get_next(pc);
 
-   if (next != nullptr && next->nl_count == 1)
+   if (  next != nullptr
+      && next->nl_count == 1)
    {
       // Make sure the comment is the same type at the same column
       next = chunk_get_next(next);
 
       if (  chunk_is_token(next, pc->type)
-         && (  (next->column == 1 && pc->column == 1)
-            || (next->column == cmt.base_col && pc->column == cmt.base_col)
-            || (next->column > cmt.base_col && get_chunk_parent_type(pc) == CT_COMMENT_END)))
+         && (  (  next->column == 1
+               && pc->column == 1)
+            || (  next->column == cmt.base_col
+               && pc->column == cmt.base_col)
+            || (  next->column > cmt.base_col
+               && get_chunk_parent_type(pc) == CT_COMMENT_END)))
       {
          return(true);
       }
@@ -1283,7 +1659,8 @@ static chunk_t *output_comment_c(chunk_t *first)
    // See if we can combine this comment with the next comment
    log_rule_B("cmt_c_group");
 
-   if (!options::cmt_c_group() || !can_combine_comment(first, cmt))
+   if (  !options::cmt_c_group()
+      || !can_combine_comment(first, cmt))
    {
       // Just add the single comment
       log_rule_B("cmt_star_cont");
@@ -1334,7 +1711,8 @@ static chunk_t *output_comment_c(chunk_t *first)
    }
    tmp.set(pc->str, 2, pc->len() - 4);
 
-   if (cpd.last_char == '*' && tmp[0] == '/')
+   if (  cpd.last_char == '*'
+      && tmp[0] == '/')
    {
       add_text(" ");
    }
@@ -1375,7 +1753,8 @@ static chunk_t *output_comment_cpp(chunk_t *first)
       bool       grouping  = (sComment[2] == '@');
       size_t     brace     = 3;
 
-      if (sComment[2] == '/' || sComment[2] == '!') // doxygen style found!
+      if (  sComment[2] == '/'
+         || sComment[2] == '!') // doxygen style found!
       {
          leadin += sComment[2];                     // at least one additional char (either "///" or "//!")
 
@@ -1391,7 +1770,8 @@ static chunk_t *output_comment_cpp(chunk_t *first)
       }
 
       if (  grouping
-         && (sComment[brace] == '{' || sComment[brace] == '}'))
+         && (  sComment[brace] == '{'
+            || sComment[brace] == '}'))
       {
          leadin += '@';
          leadin += sComment[brace];
@@ -1418,13 +1798,38 @@ static chunk_t *output_comment_cpp(chunk_t *first)
 
    if (!options::cmt_cpp_to_c())
    {
+      auto const *cmt_text = first->str.c_str() + 2;
+      // Add or remove space after the opening of a C++ comment,
+      // i.e. '// A' vs. '//A'.
+      auto *sp_cmt = &options::sp_cmt_cpp_start;
+
       cmt.cont_text = leadin;
 
+      // Get start of comment text
+      while (  *cmt_text != '\0'
+            && unc_isspace(*cmt_text))
+      {
+         ++cmt_text;
+      }
+
+      // Determine if we are dealing with a region marker
+      if (  (  !first->prev
+            || first->prev->orig_line != first->orig_line)
+         && (  strncmp(cmt_text, "BEGIN", 5) == 0
+            || strncmp(cmt_text, "END", 3) == 0))
+      {
+         // If sp_cmt_cpp_region is not ignore, use that instead of
+         // sp_cmt_cpp_start
+         if (options::sp_cmt_cpp_region() != IARF_IGNORE)
+         {
+            sp_cmt = &options::sp_cmt_cpp_region;
+         }
+      }
       // Add or remove space after the opening of a C++ comment,
       // i.e. '// A' vs. '//A'.
-      log_rule_B("sp_cmt_cpp_start");
+      log_rule_B(sp_cmt->name());
 
-      if (options::sp_cmt_cpp_start() != IARF_REMOVE)
+      if ((*sp_cmt)() != IARF_REMOVE)
       {
          cmt.cont_text += ' ';
       }
@@ -1432,9 +1837,9 @@ static chunk_t *output_comment_cpp(chunk_t *first)
 
       // Add or remove space after the opening of a C++ comment,
       // i.e. '// A' vs. '//A'.
-      log_rule_B("sp_cmt_cpp_start");
+      log_rule_B(sp_cmt->name());
 
-      if (options::sp_cmt_cpp_start() == IARF_IGNORE)
+      if ((*sp_cmt)() == IARF_IGNORE)
       {
          add_comment_text(first->str, cmt, false);
       }
@@ -1450,9 +1855,10 @@ static chunk_t *output_comment_cpp(chunk_t *first)
          // i.e. '// A' vs. '//A'.
          log_rule_B("sp_cmt_cpp_start");
 
-         if (options::sp_cmt_cpp_start() & IARF_REMOVE)
+         if ((*sp_cmt)() & IARF_REMOVE)
          {
-            while ((tmp.size() > 0) && unc_isspace(tmp[0]))
+            while (  (tmp.size() > 0)
+                  && unc_isspace(tmp[0]))
             {
                tmp.pop_front();
             }
@@ -1464,9 +1870,10 @@ static chunk_t *output_comment_cpp(chunk_t *first)
             // i.e. '// A' vs. '//A'.
             log_rule_B("sp_cmt_cpp_start");
 
-            if (options::sp_cmt_cpp_start() & IARF_ADD)
+            if ((*sp_cmt)() & IARF_ADD)
             {
-               if (!unc_isspace(tmp[0]) && (tmp[0] != '/'))
+               if (  !unc_isspace(tmp[0])
+                  && (tmp[0] != '/'))
                {
                   add_comment_text(" ", cmt, false);
                }
@@ -1486,7 +1893,8 @@ static chunk_t *output_comment_cpp(chunk_t *first)
    // See if we can combine this comment with the next comment
    log_rule_B("cmt_cpp_group");
 
-   if (!options::cmt_cpp_group() || !can_combine_comment(first, cmt))
+   if (  !options::cmt_cpp_group()
+      || !can_combine_comment(first, cmt))
    {
       // nothing to group: just output a single line
       add_text("/*");
@@ -1526,7 +1934,8 @@ static chunk_t *output_comment_cpp(chunk_t *first)
       offs = unc_isspace(pc->str[2]) ? 1 : 0;
       tmp.set(pc->str, 2 + offs, pc->len() - (2 + offs));
 
-      if (cpd.last_char == '*' && tmp[0] == '/')
+      if (  cpd.last_char == '*'
+         && tmp[0] == '/')
       {
          add_text(" ");
       }
@@ -1555,7 +1964,8 @@ static void cmt_trim_whitespace(unc_text &line, bool in_preproc)
 {
    // Remove trailing whitespace on the line
    while (  line.size() > 0
-         && (line.back() == ' ' || line.back() == '\t'))
+         && (  line.back() == ' '
+            || line.back() == '\t'))
    {
       line.pop_back();
    }
@@ -1571,7 +1981,8 @@ static void cmt_trim_whitespace(unc_text &line, bool in_preproc)
       line.pop_back();
 
       while (  line.size() > 0
-            && (line.back() == ' ' || line.back() == '\t'))
+            && (  line.back() == ' '
+               || line.back() == '\t'))
       {
          do_space = true;
          line.pop_back();
@@ -1586,11 +1997,69 @@ static void cmt_trim_whitespace(unc_text &line, bool in_preproc)
 } // cmt_trim_whitespace
 
 
+/**
+ * Return an indexed-map of reflow fold end of line/beginning of line regex pairs read
+ * from file
+ */
+static std::map<std::size_t, std::pair<std::wregex, std::wregex> > get_reflow_fold_regex_map()
+{
+   /**
+    * TODO: should the following be static to prevent initializing it multiple times?
+    */
+   static std::map<std::size_t, std::pair<std::wregex, std::wregex> > regex_map;
+
+   if (regex_map.empty())
+   {
+      if (!options::cmt_reflow_fold_regex_file().empty())
+      {
+         std::wstring raw_wstring(cpd.reflow_fold_regex.raw.begin(),
+                                  cpd.reflow_fold_regex.raw.end());
+
+         std::wregex criteria(L"\\s*(?:(?:(beg_of_next)|(end_of_prev))_line_regex)"
+                              "\\s*\\[\\s*([0-9]+)\\s*\\]\\s*=\\s*\"(.*)\"\\s*"
+                              "(?=\\r\\n|\\r|\\n|$)");
+         std::wsregex_iterator it_regex(raw_wstring.cbegin(), raw_wstring.cend(), criteria);
+         std::wsregex_iterator it_regex_end = std::wsregex_iterator();
+
+         while (it_regex != it_regex_end)
+         {
+            std::wsmatch match = *it_regex;
+
+            if (  ((  match[1].matched
+                   || match[2].matched))
+               && match[3].matched
+               && match[4].matched)
+            {
+               auto        &&index   = std::stoi(match[3].str());
+               std::wregex *p_wregex = match[1].matched ? &regex_map[index].second
+                                                        : &regex_map[index].first;
+               *p_wregex = match[4].str();
+            }
+            ++it_regex;
+         }
+      }
+      else
+      {
+         regex_map.emplace(0L, std::make_pair(L"[\\w,\\]\\)]$", L"^[\\w,\\[\\(]"));
+         regex_map.emplace(1L, std::make_pair(L"\\.$", L"^[A-Z]"));
+      }
+   }
+   return(regex_map);
+} // get_reflow_fold_regex_map
+
+
 static void output_comment_multi(chunk_t *pc)
 {
+   if (pc == nullptr)
+   {
+      return;
+   }
    cmt_reflow cmt;
 
-   // LOG_FMT(LSYS, "%s: line %d\n", __func__, pc->orig_line);
+   char       copy[1000];
+
+   LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s', type is %s, orig_col is %zu, column is %zu\n",
+           __func__, __LINE__, pc->elided_text(copy), get_token_name(pc->type), pc->orig_col, pc->column);
 
    output_cmt_start(cmt, pc);
    log_rule_B("cmt_reflow_mode");
@@ -1607,27 +2076,83 @@ static void output_comment_multi(chunk_t *pc)
                    (options::cmt_star_cont() ? "* " : "  ");
    LOG_CONTTEXT();
 
-   // LOG_FMT(LSYS, "Indenting1 line %d to col %d (orig=%d) col_diff=%d xtra=%d cont='%s'\n",
-   //        pc->orig_line, cmt_col, pc->orig_col, col_diff, cmt.xtra_indent, cmt.cont_text.c_str());
+   std::wstring pc_wstring(pc->str.get().cbegin(),
+                           pc->str.get().cend());
+
+   size_t doxygen_javadoc_param_name_indent    = 0;
+   size_t doxygen_javadoc_continuation_indent  = 0;
+   size_t reflow_paragraph_continuation_indent = 0;
 
-   size_t   line_count = 0;
-   size_t   ccol       = pc->column; // the col of subsequent comment lines
-   size_t   cmt_idx    = 0;
-   bool     nl_end     = false;
+   calculate_doxygen_javadoc_indent_alignment(pc_wstring,
+                                              doxygen_javadoc_param_name_indent,
+                                              doxygen_javadoc_continuation_indent);
+
+   size_t   line_count                   = 0;
+   size_t   ccol                         = pc->column; // the col of subsequent comment lines
+   size_t   cmt_idx                      = 0;
+   bool     nl_end                       = false;
+   bool     doxygen_javadoc_indent_align = false;
    unc_text line;
 
+   /*
+    * Get a map of regex pairs that define expressions to match at both the end
+    * of the previous line and the beginning of the next line
+    */
+   auto &&cmt_reflow_regex_map = get_reflow_fold_regex_map();
+
    line.clear();
+   LOG_FMT(LCONTTEXT, "%s(%d): pc->len() is %zu\n",
+           __func__, __LINE__, pc->len());
+   //LOG_FMT(LCONTTEXT, "%s(%d): pc->str is %s\n",
+   //        __func__, __LINE__, pc->str.c_str());
+
+   /**
+    * check for enable/disable processing comment strings that may
+    * both be embedded within the same multi-line comment
+    */
+   auto disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str);
+   auto enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->str);
 
    while (cmt_idx < pc->len())
    {
-      int ch = pc->str[cmt_idx++];
+      int ch = pc->str[cmt_idx];
+      cmt_idx++;
+
+      if (  cmt_idx > std::size_t(disable_processing_cmt_idx)
+         && enable_processing_cmt_idx > disable_processing_cmt_idx)
+      {
+         auto     length = enable_processing_cmt_idx - disable_processing_cmt_idx;
+         unc_text verbatim_text(pc->str,
+                                disable_processing_cmt_idx,
+                                length);
+
+         add_text(verbatim_text);
+
+         cmt_idx = enable_processing_cmt_idx;
+
+         /**
+          * check for additional enable/disable processing comment strings that may
+          * both be embedded within the same multi-line comment
+          */
+         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str,
+                                                                             enable_processing_cmt_idx);
+         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->str,
+                                                                           enable_processing_cmt_idx);
+
+         /**
+          * it's probably necessary to reset the line count to prevent line
+          * continuation characters from being added to the end of the current line
+          */
+         line_count = 0;
+      }
 
       // handle the CRLF and CR endings. convert both to LF
       if (ch == '\r')
       {
          ch = '\n';
 
-         if (cmt_idx < pc->len() && pc->str[cmt_idx] == '\n')
+         if (  cmt_idx < pc->len()
+            && pc->str[cmt_idx] == '\n')
          {
             cmt_idx++;
          }
@@ -1651,7 +2176,110 @@ static void output_comment_multi(chunk_t *pc)
          }
          else
          {
-            // LOG_FMT(LSYS, "%d] Text starts in col %d\n", line_count, ccol);
+            LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
+         }
+      }
+
+      if (  ch == '@'
+         && options::cmt_align_doxygen_javadoc_tags())
+      {
+         int start_idx = cmt_idx - 1;
+         int end_idx   = match_doxygen_javadoc_tag(pc_wstring, start_idx);
+
+         if (end_idx > start_idx)
+         {
+            doxygen_javadoc_indent_align = true;
+
+            std::string match(pc->str.get().cbegin() + start_idx,
+                              pc->str.get().cbegin() + end_idx);
+
+            match.erase(std::remove_if(match.begin(),
+                                       match.end(),
+                                       ::isspace),
+                        match.end());
+
+            /**
+             * remove whitespace before the '@'
+             */
+            int line_size_before_indent = line.size();
+
+            while (  line_size_before_indent > 0
+                  && unc_isspace(line.back()))
+            {
+               line.pop_back();
+               --line_size_before_indent;
+            }
+            log_rule_B("cmt_sp_before_doxygen_javadoc_tags");
+
+            int indent = options::cmt_sp_before_doxygen_javadoc_tags();
+
+            while (indent-- > 0)
+            {
+               line.append(' ');
+            }
+            cmt_idx += (end_idx - start_idx);
+            line.append(match.c_str());
+
+            bool is_exception_tag = match.find("@exception") != std::string::npos;
+            bool is_param_tag     = match.find("@param") != std::string::npos;
+            bool is_throws_tag    = match.find("@throws") != std::string::npos;
+
+            if (  is_exception_tag
+               || is_param_tag
+               || is_throws_tag)
+            {
+               indent = int(doxygen_javadoc_param_name_indent) - int(line.size());
+
+               while (indent-- > -line_size_before_indent)
+               {
+                  line.append(' ');
+               }
+
+               while (true)
+               {
+                  cmt_idx = eat_line_whitespace(pc->str,
+                                                cmt_idx);
+
+                  while (  cmt_idx < pc->len()
+                        && !unc_isspace(pc->str[cmt_idx])
+                        && pc->str[cmt_idx] != ',')
+                  {
+                     line.append(pc->str[cmt_idx++]);
+                  }
+
+                  if (!is_param_tag)
+                  {
+                     break;
+                  }
+                  /**
+                   * check for the possibility that comma-separated parameter names are present
+                   */
+                  cmt_idx = eat_line_whitespace(pc->str,
+                                                cmt_idx);
+
+                  if (pc->str[cmt_idx] != ',')
+                  {
+                     break;
+                  }
+                  ++cmt_idx;
+                  line.append(", ");
+               }
+            }
+            cmt_idx = eat_line_whitespace(pc->str,
+                                          cmt_idx);
+            indent = int(doxygen_javadoc_continuation_indent) - int(line.size());
+
+            while (indent-- > -line_size_before_indent)
+            {
+               line.append(' ');
+            }
+
+            while (  cmt_idx < pc->len()
+                  && !unc_isspace(pc->str[cmt_idx]))
+            {
+               line.append(pc->str[cmt_idx++]);
+            }
+            continue;
          }
       }
       /*
@@ -1667,7 +2295,6 @@ static void output_comment_multi(chunk_t *pc)
          int    next_nonempty_line = -1;
          int    prev_nonempty_line = -1;
          size_t nwidx              = line.size();
-         bool   star_is_bullet     = false;
 
          // strip trailing whitespace from the line collected so far
          while (nwidx > 0)
@@ -1679,32 +2306,48 @@ static void output_comment_multi(chunk_t *pc)
                && line[nwidx] != '*'    // block comment: skip '*' at end of line
                && (pc->flags.test(PCF_IN_PREPROC)
                    ? (  line[nwidx] != '\\'
-                     || (line[nwidx + 1] != 'r' && line[nwidx + 1] != '\n'))
+                     || (  line[nwidx + 1] != '\r'
+                        && line[nwidx + 1] != '\n'))
                    : true))
             {
                prev_nonempty_line = nwidx; // last non-whitespace char in the previous line
             }
          }
-         size_t remaining = pc->len() - cmt_idx;
 
-         for (size_t nxt_len = 0;
-              (  nxt_len <= remaining
-              && pc->str[nxt_len] != 'r'  // TODO: should this be \r ?
-              && pc->str[nxt_len] != '\n');
-              nxt_len++)
+         for (size_t nxt_idx = cmt_idx;
+              (  nxt_idx < pc->len()
+              && pc->str[nxt_idx] != '\r'
+              && pc->str[nxt_idx] != '\n');
+              nxt_idx++)
          {
             if (  next_nonempty_line < 0
-               && !unc_isspace(pc->str[nxt_len])
-               && pc->str[nxt_len] != '*'
-               && (  nxt_len == remaining
-                  || (pc->flags.test(PCF_IN_PREPROC)
-                      ? (  pc->str[nxt_len] != '\\'
-                        || (  pc->str[nxt_len + 1] != 'r'  // TODO: should this be \r ?
-                           && pc->str[nxt_len + 1] != '\n'))
-                      : true)))
+               && !unc_isspace(pc->str[nxt_idx])
+               && pc->str[nxt_idx] != '*'
+               && (pc->flags.test(PCF_IN_PREPROC)
+                   ? (  pc->str[nxt_idx] != '\\'
+                     || (  pc->str[nxt_idx + 1] != '\r'
+                        && pc->str[nxt_idx + 1] != '\n'))
+                   : true))
+            {
+               next_nonempty_line = nxt_idx;  // first non-whitespace char in the next line
+            }
+         }
+
+         if (  options::cmt_reflow_indent_to_paragraph_start()
+            && next_nonempty_line >= 0
+            && (  prev_nonempty_line <= 0
+               || doxygen_javadoc_indent_align))
+         {
+            log_rule_B("cmt_reflow_indent_to_paragraph_start");
+
+            int cmt_star_indent = 0;
+
+            while (  next_nonempty_line > cmt_star_indent
+                  && pc->str[next_nonempty_line - cmt_star_indent - 1] != '*')
             {
-               next_nonempty_line = nxt_len;  // first non-whitespace char in the next line
+               ++cmt_star_indent;
             }
+            reflow_paragraph_continuation_indent = size_t(cmt_star_indent);
          }
 
          /*
@@ -1738,29 +2381,63 @@ static void output_comment_multi(chunk_t *pc)
           * (the ambiguous '*'-for-bullet case!)
           */
          if (  prev_nonempty_line >= 0
-            && next_nonempty_line >= 0
-            && (  (  (  unc_isalnum(line[prev_nonempty_line])
-                     || strchr(",)]", line[prev_nonempty_line]))
-                  && (  unc_isalnum(pc->str[next_nonempty_line])
-                     || strchr("([", pc->str[next_nonempty_line])))
-               || (  '.' == line[prev_nonempty_line] // dot followed by non-capital is NOT a new sentence start
-                  && unc_isupper(pc->str[next_nonempty_line])))
-            && !star_is_bullet)
-         {
-            // rewind the line to the last non-alpha:
-            line.resize(prev_nonempty_line + 1);
-            // roll the current line forward to the first non-alpha:
-            cmt_idx += next_nonempty_line;
-            // override the NL and make it a single whitespace:
-            ch = ' ';
+            && next_nonempty_line >= int(cmt_idx))
+         {
+            std::wstring prev_line(line.get().cbegin(),
+                                   line.get().cend());
+            std::wstring next_line(pc->str.get().cbegin() + next_nonempty_line,
+                                   pc->str.get().cend());
+
+            for (auto &&cmt_reflow_regex_map_entry : cmt_reflow_regex_map)
+            {
+               auto         &&cmt_reflow_regex_pair  = cmt_reflow_regex_map_entry.second;
+               auto         &&end_of_prev_line_regex = cmt_reflow_regex_pair.first;
+               auto         &&beg_of_next_line_regex = cmt_reflow_regex_pair.second;
+               std::wsmatch match[2];
+
+               if (  std::regex_search(prev_line, match[0], end_of_prev_line_regex)
+                  && match[0].position(0) + match[0].length(0) == std::wsmatch::difference_type(line.size())
+                  && std::regex_search(next_line, match[1], beg_of_next_line_regex)
+                  && match[1].position(0) == 0)
+               {
+                  // rewind the line to the last non-alpha:
+                  line.resize(prev_nonempty_line + 1);
+
+                  // roll the current line forward to the first non-alpha:
+                  cmt_idx = next_nonempty_line;
+                  // override the NL and make it a single whitespace:
+                  ch = ' ';
+
+                  break;
+               }
+            }
          }
       }
+
+      if (ch == '\n')
+      {
+         LOG_FMT(LCONTTEXT, "%s(%d):ch is newline\n", __func__, __LINE__);
+      }
+      else
+      {
+         LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
+      }
       line.append(ch);
 
-      if (  ch == '\n'              // If we hit an end of line sign
-         || cmt_idx == pc->len())   // or hit an end-of-comment
+      // If we just hit an end of line OR we just hit end-of-comment...
+      if (  ch == '\n'
+         || cmt_idx == pc->len())
       {
+         if (ch == '\n')
+         {
+            LOG_FMT(LCONTTEXT, "%s(%d):ch is newline\n", __func__, __LINE__);
+         }
+         else
+         {
+            LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
+         }
          line_count++;
+         LOG_FMT(LCONTTEXT, "%s(%d):line_count is %zu\n", __func__, __LINE__, line_count);
 
          // strip trailing tabs and spaces before the newline
          if (ch == '\n')
@@ -1769,7 +2446,6 @@ static void output_comment_multi(chunk_t *pc)
             line.pop_back();
             cmt_trim_whitespace(line, pc->flags.test(PCF_IN_PREPROC));
          }
-         // LOG_FMT(LSYS, "[%3d]%s\n", ccol, line);
 
          if (line_count == 1)
          {
@@ -1814,8 +2490,8 @@ static void output_comment_multi(chunk_t *pc)
                   {
                      add_char(' ');
                   }
-                  //Multiline comments with can have empty lines with some spaces in them for alignment
-                  //While adding * symbol and alligning them we don't want to keep these trailing spaces
+                  // multiline comments can have empty lines with some spaces in them for alignment
+                  // while adding * symbol and aligning them we don't want to keep these trailing spaces
                   unc_text tmp = unc_text(cmt.cont_text);
                   cmt_trim_whitespace(tmp, false);
                   add_text(tmp);
@@ -1834,7 +2510,8 @@ static void output_comment_multi(chunk_t *pc)
                   && line[0] != '*'
                   && line[0] != '|'
                   && line[0] != '#'
-                  && (line[0] != '\\' || unc_isalpha(line[1]))
+                  && (  line[0] != '\\'
+                     || unc_isalpha(line[1]))
                   && line[0] != '+')
                {
                   // The number of spaces to insert at the start of subsequent comment lines.
@@ -1903,7 +2580,20 @@ static void output_comment_multi(chunk_t *pc)
                      }
                   }
                }
-               add_comment_text(line, cmt, false);
+               size_t continuation_indent = 0;
+
+               if (doxygen_javadoc_indent_align)
+               {
+                  continuation_indent = doxygen_javadoc_continuation_indent;
+               }
+               else if (reflow_paragraph_continuation_indent > 0)
+               {
+                  continuation_indent = reflow_paragraph_continuation_indent;
+               }
+               add_comment_text(line,
+                                cmt,
+                                false,
+                                continuation_indent);
 
                if (nl_end)
                {
@@ -1912,7 +2602,8 @@ static void output_comment_multi(chunk_t *pc)
             }
          }
          line.clear();
-         ccol = 1;
+         doxygen_javadoc_indent_align = false;
+         ccol                         = 1;
       }
    }
 } // output_comment_multi
@@ -1987,12 +2678,13 @@ static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt)
    }
    out_txt.append(fcn->str);
 
-   chunk_t *tmp  = chunk_get_next_ncnl(fcn);
+   chunk_t *tmp  = chunk_get_next_ncnnl(fcn);
    chunk_t *word = nullptr;
 
    while (tmp != nullptr)
    {
-      if (chunk_is_token(tmp, CT_BRACE_OPEN) || chunk_is_token(tmp, CT_SEMICOLON))
+      if (  chunk_is_token(tmp, CT_BRACE_OPEN)
+         || chunk_is_token(tmp, CT_SEMICOLON))
       {
          break;
       }
@@ -2011,7 +2703,7 @@ static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt)
       {
          word = tmp;
       }
-      tmp = chunk_get_next_ncnl(tmp);
+      tmp = chunk_get_next_ncnnl(tmp);
    }
    return(true);
 } // kw_fcn_message
@@ -2055,7 +2747,8 @@ static bool kw_fcn_function(chunk_t *cmt, unc_text &out_txt)
          out_txt.append("operator ");
       }
 
-      if (fcn->prev && fcn->prev->type == CT_DESTRUCTOR)
+      if (  fcn->prev != nullptr
+         && fcn->prev->type == CT_DESTRUCTOR)
       {
          out_txt.append('~');
       }
@@ -2081,12 +2774,13 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
 
    if (chunk_is_token(fcn, CT_OC_MSG_DECL))
    {
-      chunk_t *tmp = chunk_get_next_ncnl(fcn);
+      chunk_t *tmp = chunk_get_next_ncnnl(fcn);
       has_param = false;
 
       while (tmp != nullptr)
       {
-         if (chunk_is_token(tmp, CT_BRACE_OPEN) || chunk_is_token(tmp, CT_SEMICOLON))
+         if (  chunk_is_token(tmp, CT_BRACE_OPEN)
+            || chunk_is_token(tmp, CT_SEMICOLON))
          {
             break;
          }
@@ -2109,7 +2803,7 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
          {
             has_param = true;
          }
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
       fpo = fpc = nullptr;
    }
@@ -2131,15 +2825,16 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
    chunk_t *tmp;
 
    // Check for 'foo()' and 'foo(void)'
-   if (chunk_get_next_ncnl(fpo) == fpc)
+   if (chunk_get_next_ncnnl(fpo) == fpc)
    {
       has_param = false;
    }
    else
    {
-      tmp = chunk_get_next_ncnl(fpo);
+      tmp = chunk_get_next_ncnnl(fpo);
 
-      if ((tmp == chunk_get_prev_ncnl(fpc)) && chunk_is_str(tmp, "void", 4))
+      if (  (tmp == chunk_get_prev_ncnnl(fpc))
+         && chunk_is_str(tmp, "void", 4))
       {
          has_param = false;
       }
@@ -2152,7 +2847,8 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
 
       while ((tmp = chunk_get_next(tmp)) != nullptr)
       {
-         if (chunk_is_token(tmp, CT_COMMA) || tmp == fpc)
+         if (  chunk_is_token(tmp, CT_COMMA)
+            || tmp == fpc)
          {
             if (need_nl)
             {
@@ -2182,15 +2878,18 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
       }
    }
    // Do the return stuff
-   tmp = chunk_get_prev_ncnl(fcn);
+   tmp = chunk_get_prev_ncnnl(fcn);
 
    // For Objective-C we need to go to the previous chunk
-   if (tmp != nullptr && get_chunk_parent_type(tmp) == CT_OC_MSG_DECL && chunk_is_token(tmp, CT_PAREN_CLOSE))
+   if (  tmp != nullptr
+      && get_chunk_parent_type(tmp) == CT_OC_MSG_DECL
+      && chunk_is_token(tmp, CT_PAREN_CLOSE))
    {
-      tmp = chunk_get_prev_ncnl(tmp);
+      tmp = chunk_get_prev_ncnnl(tmp);
    }
 
-   if (tmp != nullptr && !chunk_is_str(tmp, "void", 4))
+   if (  tmp != nullptr
+      && !chunk_is_str(tmp, "void", 4))
    {
       if (need_nl)
       {
@@ -2216,12 +2915,12 @@ static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt)
       // if inside a class, we need to find to the class name
       chunk_t *tmp = chunk_get_prev_type(fcn, CT_BRACE_OPEN, fcn->level - 1);
       tmp = chunk_get_prev_type(tmp, CT_CLASS, tmp->level);
-      tmp = chunk_get_next_ncnl(tmp);
+      tmp = chunk_get_next_ncnnl(tmp);
 
-      while (chunk_is_token(chunk_get_next_ncnl(tmp), CT_DC_MEMBER))
+      while (chunk_is_token(chunk_get_next_ncnnl(tmp), CT_DC_MEMBER))
       {
-         tmp = chunk_get_next_ncnl(tmp);
-         tmp = chunk_get_next_ncnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = chunk_get_next_ncnnl(tmp);
       }
 
       if (tmp != nullptr)
@@ -2233,17 +2932,18 @@ static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt)
    else
    {
       // if outside a class, we expect "CLASS::METHOD(...)"
-      chunk_t *tmp = chunk_get_prev_ncnl(fcn);
+      chunk_t *tmp = chunk_get_prev_ncnnl(fcn);
 
       if (chunk_is_token(tmp, CT_OPERATOR))
       {
-         tmp = chunk_get_prev_ncnl(tmp);
+         tmp = chunk_get_prev_ncnnl(tmp);
       }
 
       if (  tmp != nullptr
-         && (chunk_is_token(tmp, CT_DC_MEMBER) || chunk_is_token(tmp, CT_MEMBER)))
+         && (  chunk_is_token(tmp, CT_DC_MEMBER)
+            || chunk_is_token(tmp, CT_MEMBER)))
       {
-         tmp = chunk_get_prev_ncnl(tmp);
+         tmp = chunk_get_prev_ncnnl(tmp);
          out_txt.append(tmp->str);
          return(true);
       }
@@ -2321,13 +3021,17 @@ static void output_comment_multi_simple(chunk_t *pc)
    }
    cmt_reflow cmt;
 
+   LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s', type is %s, orig_col is %zu, column is %zu\n",
+           __func__, __LINE__, pc->text(), get_token_name(pc->type), pc->orig_col, pc->column);
+
    output_cmt_start(cmt, pc);
 
    // The multiline comment is saved inside one chunk. If the comment is
-   // shifted all lines of the comment need to be shifter by the same amount.
+   // shifted all lines of the comment need to be shifted by the same amount.
    // Save the difference of initial and current position to apply it on every
    // line_column
-   const int col_diff = [pc]() {
+   const int col_diff = [pc]()
+   {
       int diff = 0;
 
       if (chunk_is_newline(chunk_get_prev(pc)))
@@ -2338,6 +3042,13 @@ static void output_comment_multi_simple(chunk_t *pc)
       return(diff);
    }();
 
+   /**
+    * check for enable/disable processing comment strings that may
+    * both be embedded within the same multi-line comment
+    */
+   auto     disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str);
+   auto     enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->str);
+
    unc_text line;
    size_t   line_count  = 0;
    size_t   line_column = pc->column;
@@ -2348,11 +3059,37 @@ static void output_comment_multi_simple(chunk_t *pc)
       int ch = pc->str[cmt_idx];
       cmt_idx++;
 
+      if (  cmt_idx > std::size_t(disable_processing_cmt_idx)
+         && enable_processing_cmt_idx > disable_processing_cmt_idx)
+      {
+         auto     length = enable_processing_cmt_idx - disable_processing_cmt_idx;
+         unc_text verbatim_text(pc->str,
+                                disable_processing_cmt_idx,
+                                length);
+
+         add_text(verbatim_text);
+
+         cmt_idx = enable_processing_cmt_idx;
+
+         /**
+          * check for additional enable/disable processing comment strings that may
+          * both be embedded within the same multi-line comment
+          */
+         disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str,
+                                                                             enable_processing_cmt_idx);
+         enable_processing_cmt_idx = find_enable_processing_comment_marker(pc->str,
+                                                                           enable_processing_cmt_idx);
+
+         line.clear();
+
+         continue;
+      }
       // 1: step through leading tabs and spaces to find the start column
       log_rule_B("cmt_convert_tab_to_spaces");
 
       if (  line.size() == 0
-         && (line_column < cmt.base_col || options::cmt_convert_tab_to_spaces()))
+         && (  line_column < cmt.base_col
+            || options::cmt_convert_tab_to_spaces()))
       {
          if (ch == ' ')
          {
@@ -2365,6 +3102,10 @@ static void output_comment_multi_simple(chunk_t *pc)
             line_column = calc_next_tab_column(line_column, options::input_tab_size());
             continue;
          }
+         else
+         {
+            LOG_FMT(LCONTTEXT, "%s(%d):ch is %d, %c\n", __func__, __LINE__, ch, char(ch));
+         }
       }
 
       // 2: add chars to line, handle the CRLF and CR endings (convert both to LF)
@@ -2372,17 +3113,22 @@ static void output_comment_multi_simple(chunk_t *pc)
       {
          ch = '\n';
 
-         if ((cmt_idx < pc->len()) && (pc->str[cmt_idx] == '\n'))
+         if (  (cmt_idx < pc->len())
+            && (pc->str[cmt_idx] == '\n'))
          {
             cmt_idx++;
          }
       }
+      LOG_FMT(LCONTTEXT, "%s(%d):Line is %s\n", __func__, __LINE__, line.c_str());
       line.append(ch);
+      LOG_FMT(LCONTTEXT, "%s(%d):Line is %s\n", __func__, __LINE__, line.c_str());
 
       // If we just hit an end of line OR we just hit end-of-comment...
-      if (ch == '\n' || cmt_idx == pc->len())
+      if (  ch == '\n'
+         || cmt_idx == pc->len())
       {
          line_count++;
+         LOG_FMT(LCONTTEXT, "%s(%d):line_count is %zu\n", __func__, __LINE__, line_count);
 
          // strip trailing tabs and spaces before the newline
          if (ch == '\n')
@@ -2405,7 +3151,8 @@ static void output_comment_multi_simple(chunk_t *pc)
                if (line_count > 1)
                {
                   // apply comment column shift without underflowing
-                  line_column = (col_diff < 0 && (cast_abs(line_column, col_diff) > line_column))
+                  line_column = (  col_diff < 0
+                                && (cast_abs(line_column, col_diff) > line_column))
                                 ? 0 : line_column + col_diff;
                }
                cmt.column = line_column;
@@ -2445,7 +3192,8 @@ static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef)
          dst   += ' ';
          column = -1;
       }
-      else if (chunk_is_token(pc, CT_COMMENT) || chunk_is_token(pc, CT_COMMENT_EMBED))
+      else if (  chunk_is_token(pc, CT_COMMENT)
+              || chunk_is_token(pc, CT_COMMENT_EMBED))
       {
       }
       else // if (chunk_is_token(pc, CT_JUNK)) || else
@@ -2468,7 +3216,7 @@ void add_long_preprocessor_conditional_block_comment(void)
    chunk_t *pp_start = nullptr;
    chunk_t *pp_end   = nullptr;
 
-   for (chunk_t *pc = chunk_get_head(); pc; pc = chunk_get_next_ncnl(pc))
+   for (chunk_t *pc = chunk_get_head(); pc; pc = chunk_get_next_ncnnl(pc))
    {
       // just track the preproc level:
       if (chunk_is_token(pc, CT_PREPROC))
@@ -2476,7 +3224,8 @@ void add_long_preprocessor_conditional_block_comment(void)
          pp_end = pp_start = pc;
       }
 
-      if (pc->type != CT_PP_IF || !pp_start)
+      if (  pc->type != CT_PP_IF
+         || !pp_start)
       {
          continue;
       }
@@ -2522,7 +3271,8 @@ void add_long_preprocessor_conditional_block_comment(void)
                     (tmp ? tmp->type : -1), (tmp ? chunk_is_newline(tmp) ? "newline"
                                              : chunk_is_comment(tmp) ? "comment" : "other" : "---"));
 
-            if (tmp == nullptr || chunk_is_token(tmp, CT_NEWLINE))  // chunk_is_newline(tmp))
+            if (  tmp == nullptr
+               || chunk_is_token(tmp, CT_NEWLINE)) // chunk_is_newline(tmp))
             {
                size_t nl_min;
 
@@ -2540,7 +3290,8 @@ void add_long_preprocessor_conditional_block_comment(void)
                LOG_FMT(LPPIF, "#if / %s section candidate for augmenting when over NL threshold %zu != 0 (nl_count=%zu)\n",
                        txt, nl_min, nl_count);
 
-               if (nl_min > 0 && nl_count > nl_min)  // nl_count is 1 too large at all times as #if line was counted too
+               if (  nl_min > 0
+                  && nl_count > nl_min) // nl_count is 1 too large at all times as #if line was counted too
                {
                   // determine the added comment style
                   c_token_t style = (language_is_set(LANG_CPP)) ?
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/output.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.h
index 2af77ea1..2af77ea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/output.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/output.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.cpp
index f6ce7722..51ee4710 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.cpp
@@ -8,15 +8,7 @@
 
 #include "parens.h"
 
-#include "chunk_list.h"
 #include "log_rules.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 using namespace uncrustify;
 
@@ -48,6 +40,8 @@ static void check_bool_parens(chunk_t *popen, chunk_t *pclose, int nest);
 
 void do_parens(void)
 {
+   constexpr static auto LCURRENT = LPARADD;
+
    LOG_FUNC_ENTRY();
 
    log_rule_B("mod_full_paren_if_bool");
@@ -56,7 +50,7 @@ void do_parens(void)
    {
       chunk_t *pc = chunk_get_head();
 
-      while ((pc = chunk_get_next_ncnl(pc)) != nullptr)
+      while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
       {
          if (  pc->type != CT_SPAREN_OPEN
             || (  get_chunk_parent_type(pc) != CT_IF
@@ -88,7 +82,7 @@ static void add_parens_between(chunk_t *first, chunk_t *last)
            last->text(), last->level);
 
    // Don't do anything if we have a bad sequence, ie "&& )"
-   chunk_t *first_n = chunk_get_next_ncnl(first);
+   chunk_t *first_n = chunk_get_next_ncnnl(first);
 
    if (first_n == last)
    {
@@ -107,7 +101,7 @@ static void add_parens_between(chunk_t *first, chunk_t *last)
 
    chunk_add_before(&pc, first_n);
 
-   chunk_t *last_p = chunk_get_prev_ncnl(last, scope_e::PREPROC);
+   chunk_t *last_p = chunk_get_prev_ncnnl(last, scope_e::PREPROC);
 
    set_chunk_type(&pc, CT_PAREN_CLOSE);
    pc.orig_line   = last_p->orig_line;
@@ -122,7 +116,7 @@ static void add_parens_between(chunk_t *first, chunk_t *last)
 
    for (chunk_t *tmp = first_n;
         tmp != last_p;
-        tmp = chunk_get_next_ncnl(tmp))
+        tmp = chunk_get_next_ncnnl(tmp))
    {
       tmp->level++;
    }
@@ -146,7 +140,8 @@ static void check_bool_parens(chunk_t *popen, chunk_t *pclose, int nest)
 
    chunk_t *pc = popen;
 
-   while ((pc = chunk_get_next_ncnl(pc)) != nullptr && pc != pclose)
+   while (  (pc = chunk_get_next_ncnnl(pc)) != nullptr
+         && pc != pclose)
    {
       if (pc->flags.test(PCF_IN_PREPROC))
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.h
index c0433f92..c0433f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parens.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.cpp
new file mode 100644
index 00000000..42a3f840
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.cpp
@@ -0,0 +1,53 @@
+/**
+ * @file parent_for_pp.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "parent_for_pp.h"
+
+#include "chunk_list.h"
+
+
+void do_parent_for_pp(void)
+{
+   LOG_FUNC_ENTRY();
+
+   vector<chunk_t *> viz;
+
+   chunk_t           *pc = chunk_get_head();
+
+   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   {
+      // CT_PP_IF,            // #if, #ifdef, or #ifndef
+      // CT_PP_ELSE,          // #else or #elif
+      // CT_PP_ENDIF,         // #endif
+      if (chunk_is_token(pc, CT_PP_IF))
+      {
+         LOG_FMT(LMCB, "%s(%d): IF: orig_line %zu, orig_col is %zu\n",
+                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+         log_pcf_flags(LMCB, pc->flags);
+         viz.push_back(pc);
+      }
+      else if (chunk_is_token(pc, CT_PP_ELSE))
+      {
+         LOG_FMT(LMCB, "%s(%d): ELSE: orig_line %zu, orig_col is %zu\n",
+                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+         log_pcf_flags(LMCB, pc->flags);
+         size_t  level = pc->pp_level;
+         chunk_t *a    = viz.at(level - 1);
+         chunk_set_parent(pc, a);
+      }
+      else if (chunk_is_token(pc, CT_PP_ENDIF))
+      {
+         LOG_FMT(LMCB, "%s(%d): ENDIF: orig_line %zu, orig_col is %zu\n",
+                 __func__, __LINE__, pc->orig_line, pc->orig_col);
+         log_pcf_flags(LMCB, pc->flags);
+         size_t  level = pc->pp_level;
+         chunk_t *a    = viz.at(level);
+         chunk_set_parent(pc, a);
+         viz.pop_back();
+      }
+   }
+} // do_parent_for_pp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.h
new file mode 100644
index 00000000..cb069680
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/parent_for_pp.h
@@ -0,0 +1,17 @@
+/**
+ * @file parent_for_pp.h
+ * prototype for parent_for_pp.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#ifndef PARENT_FOR_PP_H_INCLUDED
+#define PARENT_FOR_PP_H_INCLUDED
+
+
+// mark the parent
+void do_parent_for_pp(void);
+
+
+#endif /* PARENT_FOR_PP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/pcf_flags.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.cpp
index c2c8de27..0a22bf72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/pcf_flags.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.cpp
@@ -54,7 +54,8 @@ static const char *pcf_names[] =
    "IN_FCN_CTOR",       // 42                    Issue #2152
    "IN_TRY_BLOCK",      // 43                    Issue #1734
    "INCOMPLETE",        // 44
-   "WF_IF",             // 45
+   "IN_LAMBDA",         // 45
+   "WF_IF",             // 46
 };
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/pcf_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.h
index 150b1f3d..c0465c14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/pcf_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/pcf_flags.h
@@ -8,10 +8,7 @@
 #ifndef PCF_FLAGS_STR_INCLUDED
 #define PCF_FLAGS_STR_INCLUDED
 
-#include "base_types.h"
-
 #include "enum_flags.h"
-#include "log_levels.h"
 #include "logger.h"
 
 #include <cstddef>      // do get the definition of size_t
@@ -29,7 +26,7 @@ constexpr auto pcf_bit(size_t b) -> decltype(0ULL)
    return(1ULL << b);
 }
 
-enum pcf_flag_e : decltype(0ULL)
+enum pcf_flag_e : decltype ( 0ULL )
 {
 // Copy flags are in the lower 17 bits
    PCF_NONE            = 0ULL,
@@ -53,38 +50,39 @@ enum pcf_flag_e : decltype(0ULL)
    PCF_IN_DECLTYPE     = pcf_bit(16),
 
 // Non-Copy flags are in the upper 47 bits
-   PCF_FORCE_SPACE    = pcf_bit(17),   //! must have a space after this token
-   PCF_STMT_START     = pcf_bit(18),   //! marks the start of a statement
-   PCF_EXPR_START     = pcf_bit(19),
-   PCF_DONT_INDENT    = pcf_bit(20),   //! already aligned!
-   PCF_ALIGN_START    = pcf_bit(21),
-   PCF_WAS_ALIGNED    = pcf_bit(22),
-   PCF_VAR_TYPE       = pcf_bit(23),   //! part of a variable def type
-   PCF_VAR_DEF        = pcf_bit(24),   //! variable name in a variable def
-   PCF_VAR_1ST        = pcf_bit(25),   //! 1st variable def in a statement
-   PCF_VAR_1ST_DEF    = (PCF_VAR_DEF | PCF_VAR_1ST),
-   PCF_VAR_INLINE     = pcf_bit(26),   //! type was an inline struct/enum/union
-   PCF_RIGHT_COMMENT  = pcf_bit(27),
-   PCF_OLD_FCN_PARAMS = pcf_bit(28),
-   PCF_LVALUE         = pcf_bit(29),   //! left of assignment
-   PCF_ONE_LINER      = pcf_bit(30),
-   PCF_ONE_CLASS      = (PCF_ONE_LINER | PCF_IN_CLASS),
-   PCF_EMPTY_BODY     = pcf_bit(31),
-   PCF_ANCHOR         = pcf_bit(32),   //! aligning anchor
-   PCF_PUNCTUATOR     = pcf_bit(33),
-   PCF_INSERTED       = pcf_bit(34),   //! chunk was inserted from another file
-   PCF_LONG_BLOCK     = pcf_bit(35),   //! the block is 'long' by some measure
-   PCF_OC_BOXED       = pcf_bit(36),   //! inside OC boxed expression
-   PCF_KEEP_BRACE     = pcf_bit(37),   //! do not remove brace
-   PCF_OC_RTYPE       = pcf_bit(38),   //! inside OC return type
-   PCF_OC_ATYPE       = pcf_bit(39),   //! inside OC arg type
-   PCF_WF_ENDIF       = pcf_bit(40),   //! #endif for whole file ifdef
-   PCF_IN_QT_MACRO    = pcf_bit(41),   //! in a QT-macro, i.e. SIGNAL, SLOT
-   PCF_IN_FCN_CTOR    = pcf_bit(42),   //! inside function constructor
-   PCF_IN_TRY_BLOCK   = pcf_bit(43),   //! inside Function-try-block
-   PCF_INCOMPLETE     = pcf_bit(44),   //! class/struct forward declaration
-   PCF_WF_IF          = pcf_bit(45),   //! #if for a whole file ifdef
-   PCF_NOT_POSSIBLE   = pcf_bit(46),   //! it is not possible to make an one_liner
+   PCF_FORCE_SPACE     = pcf_bit(17),  //! must have a space after this token
+   PCF_STMT_START      = pcf_bit(18),  //! marks the start of a statement
+   PCF_EXPR_START      = pcf_bit(19),
+   PCF_DONT_INDENT     = pcf_bit(20),  //! already aligned!
+   PCF_ALIGN_START     = pcf_bit(21),
+   PCF_WAS_ALIGNED     = pcf_bit(22),
+   PCF_VAR_TYPE        = pcf_bit(23),  //! part of a variable def type
+   PCF_VAR_DEF         = pcf_bit(24),  //! variable name in a variable def
+   PCF_VAR_1ST         = pcf_bit(25),  //! 1st variable def in a statement
+   PCF_VAR_1ST_DEF     = (PCF_VAR_DEF | PCF_VAR_1ST),
+   PCF_VAR_INLINE      = pcf_bit(26),  //! type was an inline struct/enum/union
+   PCF_RIGHT_COMMENT   = pcf_bit(27),
+   PCF_OLD_FCN_PARAMS  = pcf_bit(28),
+   PCF_LVALUE          = pcf_bit(29),  //! left of assignment
+   PCF_ONE_LINER       = pcf_bit(30),
+   PCF_ONE_CLASS       = (PCF_ONE_LINER | PCF_IN_CLASS),
+   PCF_EMPTY_BODY      = pcf_bit(31),
+   PCF_ANCHOR          = pcf_bit(32),  //! aligning anchor
+   PCF_PUNCTUATOR      = pcf_bit(33),
+   PCF_INSERTED        = pcf_bit(34),  //! chunk was inserted from another file
+   PCF_LONG_BLOCK      = pcf_bit(35),  //! the block is 'long' by some measure
+   PCF_OC_BOXED        = pcf_bit(36),  //! inside OC boxed expression
+   PCF_KEEP_BRACE      = pcf_bit(37),  //! do not remove brace
+   PCF_OC_RTYPE        = pcf_bit(38),  //! inside OC return type
+   PCF_OC_ATYPE        = pcf_bit(39),  //! inside OC arg type
+   PCF_WF_ENDIF        = pcf_bit(40),  //! #endif for whole file ifdef
+   PCF_IN_QT_MACRO     = pcf_bit(41),  //! in a QT-macro, i.e. SIGNAL, SLOT
+   PCF_IN_FCN_CTOR     = pcf_bit(42),  //! inside function constructor
+   PCF_IN_TRY_BLOCK    = pcf_bit(43),  //! inside Function-try-block
+   PCF_INCOMPLETE      = pcf_bit(44),  //! class/struct forward declaration
+   PCF_IN_LAMBDA       = pcf_bit(45),  //! inside a lambda expression
+   PCF_WF_IF           = pcf_bit(46),  //! #if for a whole file ifdef
+   PCF_NOT_POSSIBLE    = pcf_bit(47),  //! it is not possible to make an one_liner
                                        //! because the line would be too long
 };
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/prototypes.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/prototypes.h
index 3c23645d..dde8edc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/prototypes.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/prototypes.h
@@ -54,6 +54,8 @@ static inline size_t calc_next_tab_column(size_t col, size_t tabsize)
  */
 static inline size_t next_tab_column(size_t col)
 {
+   constexpr static auto LCURRENT = LINDENT;
+
    log_rule_B("output_tab_size");
    return(calc_next_tab_column(col, uncrustify::options::output_tab_size()));
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/punctuators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.cpp
index b787d207..6c9c41f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/punctuators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.cpp
@@ -8,11 +8,12 @@
 
 #include "punctuators.h"
 
-#include "log_rules.h"
+//#include "log_rules.h"
 #include "prototypes.h"
 
 #include <algorithm>
 
+constexpr static auto LCURRENT = LOTHER;
 
 using namespace std;
 using namespace uncrustify;
@@ -35,7 +36,8 @@ using namespace uncrustify;
 
 const chunk_tag_t *find_punctuator(const char *str, int lang_flags)
 {
-   if (str == nullptr || str[0] == '\0')
+   if (  str == nullptr
+      || str[0] == '\0')
    {
       return(nullptr);
    }
@@ -51,7 +53,8 @@ const chunk_tag_t *find_punctuator(const char *str, int lang_flags)
    const auto        *parent = punc_table; //!< graph in table form, initially point at first entry
    auto              ch_idx  = int{};
 
-   while (ch_idx < 6 && str[ch_idx] != '\0')  //!< symbols6: max punc len = 6
+   while (  ch_idx < 6
+         && str[ch_idx] != '\0') //!< symbols6: max punc len = 6
    {
       // search for next parent node in all current child nodes
       parent = binary_find(parent, next(parent, parent->left_in_group), str[ch_idx]);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/punctuators.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.h
index ed4c3fa5..ed4c3fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/punctuators.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/punctuators.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/quick_align_again.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.cpp
index 239b0ab9..d63e96e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/quick_align_again.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.cpp
@@ -19,8 +19,9 @@ void quick_align_again(void)
 
    for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
    {
+      char copy[1000];
       LOG_FMT(LALAGAIN, "%s(%d): orig_line is %zu, orig_col is %zu, column is %zu, text() '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->text());
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->elided_text(copy));
 
       if (  pc->align.next != nullptr
          && pc->flags.test(PCF_ALIGN_START))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/quick_align_again.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.h
index b31a450a..b31a450a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/quick_align_again.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/quick_align_again.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/remove_extra_returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.cpp
index 5447c9c1..23c51cfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/remove_extra_returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.cpp
@@ -65,7 +65,7 @@ void remove_extra_returns(void)
 
          if (remove_it)
          {
-            chunk_t *semicolon = chunk_get_next_ncnl(pc);
+            chunk_t *semicolon = chunk_get_next_ncnnl(pc);
 
             if (  semicolon != nullptr
                && chunk_is_token(semicolon, CT_SEMICOLON))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/remove_extra_returns.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.h
index 800ba9ca..800ba9ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/remove_extra_returns.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/remove_extra_returns.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.cpp
index 5785068b..bfb65107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.cpp
@@ -8,17 +8,7 @@
 
 #include "semicolons.h"
 
-#include "chunk_list.h"
-#include "ChunkStack.h"
-#include "language_tools.h"
 #include "prototypes.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 
 static void remove_semicolon(chunk_t *pc);
@@ -51,12 +41,12 @@ void remove_extra_semicolons(void)
 
    while (pc != nullptr)
    {
-      chunk_t *next = chunk_get_next_ncnl(pc);
+      chunk_t *next = chunk_get_next_ncnnl(pc);
       chunk_t *prev;
 
       if (  chunk_is_token(pc, CT_SEMICOLON)
          && !pc->flags.test(PCF_IN_PREPROC)
-         && (prev = chunk_get_prev_ncnl(pc)) != nullptr)
+         && (prev = chunk_get_prev_ncnnl(pc)) != nullptr)
       {
          LOG_FMT(LSCANSEMI, "%s(%d): Semi orig_line is %zu, orig_col is %zu, parent is %s, prev = '%s' [%s/%s]\n",
                  __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(get_chunk_parent_type(pc)),
@@ -87,7 +77,8 @@ void remove_extra_semicolons(void)
          {
             check_unknown_brace_close(pc, prev);
          }
-         else if (chunk_is_token(prev, CT_SEMICOLON) && get_chunk_parent_type(prev) != CT_FOR)
+         else if (  chunk_is_token(prev, CT_SEMICOLON)
+                 && get_chunk_parent_type(prev) != CT_FOR)
          {
             remove_semicolon(pc);
          }
@@ -118,7 +109,7 @@ static void check_unknown_brace_close(chunk_t *semi, chunk_t *brace_close)
    LOG_FUNC_ENTRY();
    chunk_t *pc = chunk_get_prev_type(brace_close, CT_BRACE_OPEN, brace_close->level);
 
-   pc = chunk_get_prev_ncnl(pc);
+   pc = chunk_get_prev_ncnnl(pc);
 
    if (  pc != nullptr
       && pc->type != CT_RETURN
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/semicolons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.h
index c0542a76..c0542a76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/semicolons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/semicolons.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/sorting.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.cpp
index ca87adc2..bec55749 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/sorting.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.cpp
@@ -8,13 +8,13 @@
 
 #include "sorting.h"
 
-#include "chunk_list.h"
-#include "log_rules.h"
 #include "newlines.h"
 #include "prototypes.h"
 
 #include <regex>
 
+constexpr static auto LCURRENT = LSORT;
+
 using namespace uncrustify;
 
 Option<std::string>  *include_category_options[] =
@@ -134,7 +134,8 @@ static bool text_contains_filename_without_ext(const char *text)
    size_t      slash_idx            = filepath.find_last_of("/\\");
    std::string filename_without_ext = filepath;
 
-   if (slash_idx != std::string::npos && slash_idx < (filepath.size() - 1))
+   if (  slash_idx != std::string::npos
+      && slash_idx < (filepath.size() - 1))
    {
       std::string filename = filepath.substr(slash_idx + 1);
       size_t      dot_idx  = filename.find_last_of('.');
@@ -203,7 +204,8 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
       return(0);
    }
 
-   while (pc1 != nullptr && pc2 != nullptr)
+   while (  pc1 != nullptr
+         && pc2 != nullptr)
    {
       auto const &s1_ext = chunk_sort_str(pc1);
       auto const &s2_ext = chunk_sort_str(pc2);
@@ -218,11 +220,13 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
          bool s1_contains_filename = text_contains_filename_without_ext(s1.c_str());
          bool s2_contains_filename = text_contains_filename_without_ext(s2.c_str());
 
-         if (s1_contains_filename && !s2_contains_filename)
+         if (  s1_contains_filename
+            && !s2_contains_filename)
          {
             return(-1);
          }
-         else if (!s1_contains_filename && s2_contains_filename)
+         else if (  !s1_contains_filename
+                 && s2_contains_filename)
          {
             return(1);
          }
@@ -234,11 +238,13 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
          const bool s1_has_dot = has_dot(s1_ext);
          const bool s2_has_dot = has_dot(s2_ext);
 
-         if (s1_has_dot && !s2_has_dot)
+         if (  s1_has_dot
+            && !s2_has_dot)
          {
             return(1);
          }
-         else if (!s1_has_dot && s2_has_dot)
+         else if (  !s1_has_dot
+                 && s2_has_dot)
          {
             return(-1);
          }
@@ -248,11 +254,13 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
       {
          log_rule_B("mod_sort_incl_import_prioritize_angle_over_quotes");
 
-         if (s1.startswith("<") && s2.startswith("\""))
+         if (  s1.startswith("<")
+            && s2.startswith("\""))
          {
             return(-1);
          }
-         else if (s1.startswith("\"") && s2.startswith("<"))
+         else if (  s1.startswith("\"")
+                 && s2.startswith("<"))
          {
             return(1);
          }
@@ -318,7 +326,8 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
       }
    }
 
-   if (pc1 == nullptr || !chunk_is_newline(pc2))
+   if (  pc1 == nullptr
+      || !chunk_is_newline(pc2))
    {
       return(-1);
    }
@@ -420,7 +429,8 @@ static void delete_chunks_on_line_having_chunk(chunk_t *chunk)
 
    chunk_t *pc = chunk_first_on_line(chunk);
 
-   while (pc != nullptr && !chunk_is_comment(pc))
+   while (  pc != nullptr
+         && !chunk_is_comment(pc))
    {
       chunk_t *next_pc = chunk_get_next(pc);
       LOG_FMT(LCHUNK, "%s(%d): Removed '%s' on orig_line %zu\n",
@@ -503,7 +513,8 @@ static void group_imports_by_adding_newlines(chunk_t **chunks, size_t num_chunks
          c_idx = -1;
       }
 
-      if (c_idx_last != c_idx && idx > 0)
+      if (  c_idx_last != c_idx
+         && idx > 0)
       {
          blankline_add_before(chunks[idx]);
       }
@@ -518,7 +529,8 @@ static void group_imports_by_adding_newlines(chunk_t **chunks, size_t num_chunks
    {
       chunk_has_dot = has_dot(chunks[idx]->str);
 
-      if (chunk_last_has_dot != chunk_has_dot && idx > 0)
+      if (  chunk_last_has_dot != chunk_has_dot
+         && idx > 0)
       {
          blankline_add_before(chunks[idx]);
       }
@@ -533,7 +545,8 @@ static void group_imports_by_adding_newlines(chunk_t **chunks, size_t num_chunks
    {
       chunk_pri = get_chunk_priority(chunks[idx]);
 
-      if (chunk_pri_last != chunk_pri && idx > 0)
+      if (  chunk_pri_last != chunk_pri
+         && idx > 0)
       {
          blankline_add_before(chunks[idx]);
       }
@@ -549,7 +562,8 @@ static void group_imports_by_adding_newlines(chunk_t **chunks, size_t num_chunks
       auto const &chunk_text = chunk_sort_str(chunks[idx]);
       chunk_has_filename = text_contains_filename_without_ext(chunk_text.c_str());
 
-      if (!chunk_has_filename && last_chunk_has_filename)
+      if (  !chunk_has_filename
+         && last_chunk_has_filename)
       {
          blankline_add_before(chunks[idx]);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/sorting.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.h
index 3bbeb4aa..5d767824 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/sorting.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/sorting.h
@@ -1,15 +1,15 @@
 /**
  * @file sorting.h
- * prototypes for sorting.c
+ * prototypes for sorting.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
  */
+
 #ifndef SORTING_H_INCLUDED
 #define SORTING_H_INCLUDED
 
 #include "uncrustify_types.h"
-#include <stdlib.h>
 
 /**
  * alphabetically sort the #include or #import
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.cpp
index 323af7ff..5383b811 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/space.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.cpp
@@ -13,29 +13,19 @@
  *   Rmk: spaces = space + nl
  *
  * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
+ * @author  Guy Maurel, 2015-2021
  * @license GPL v2+
  */
 
 #include "space.h"
 
-#include "char_table.h"
-#include "chunk_list.h"
-#include "language_tools.h"
 #include "log_rules.h"
 #include "options_for_QT.h"
-#include "prototypes.h"
 #include "punctuators.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
-
-#include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
+#ifdef WIN32
+#include <algorithm>                   // to get max
+#endif // ifdef WIN32
 
 using namespace std;
 using namespace uncrustify;
@@ -73,6 +63,18 @@ struct no_space_table_t
 
 
 /**
+ * this table lists out all combos where a space MUST be present
+ * CT_UNKNOWN is a wildcard.
+ *
+ * TODO: some of these are no longer needed.
+ */
+const no_space_table_t add_space_table[] =
+{
+#include "add_space_table.h"
+};
+
+
+/**
  * this table lists out all combos where a space should NOT be present
  * CT_UNKNOWN is a wildcard.
  *
@@ -131,20 +133,23 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    min_sp = 1;
 
-   if (chunk_is_token(first, CT_IGNORED) || chunk_is_token(second, CT_IGNORED))
+   if (  chunk_is_token(first, CT_IGNORED)
+      || chunk_is_token(second, CT_IGNORED))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_PP_IGNORE) && chunk_is_token(second, CT_PP_IGNORE))
+   if (  chunk_is_token(first, CT_PP_IGNORE)
+      && chunk_is_token(second, CT_PP_IGNORE))
    {
       // Leave spacing alone between PP_IGNORE tokens as we don't want the default behavior (which is ADD).
-      log_rule("PP_IGNORE");
+      log_rule_short("PP_IGNORE");
       return(IARF_IGNORE);
    }
 
-   if (chunk_is_token(first, CT_PP) || chunk_is_token(second, CT_PP))
+   if (  chunk_is_token(first, CT_PP)
+      || chunk_is_token(second, CT_PP))
    {
       // Add or remove space around preprocessor '##' concatenation operator.
       log_rule("sp_pp_concat");
@@ -169,21 +174,23 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_before_pp_stringify());
    }
 
-   if (chunk_is_token(first, CT_SPACE) || chunk_is_token(second, CT_SPACE))
+   if (  chunk_is_token(first, CT_SPACE)
+      || chunk_is_token(second, CT_SPACE))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (chunk_is_token(first, CT_DECLSPEC))  // Issue 1289
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(second, CT_NEWLINE) || chunk_is_token(second, CT_VBRACE_OPEN))
+   if (  chunk_is_token(second, CT_NEWLINE)
+      || chunk_is_token(second, CT_VBRACE_OPEN))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
@@ -191,25 +198,26 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       && second->type != CT_NL_CONT
       && second->type != CT_SEMICOLON) // # Issue 1158
    {
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
-   if (chunk_is_token(first, CT_VBRACE_CLOSE) && second->type != CT_NL_CONT)
+   if (  chunk_is_token(first, CT_VBRACE_CLOSE)
+      && second->type != CT_NL_CONT)
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (chunk_is_token(second, CT_VSEMICOLON))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (chunk_is_token(first, CT_MACRO_FUNC))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
@@ -220,7 +228,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_before_nl_cont());
    }
 
-   if (chunk_is_token(first, CT_D_ARRAY_COLON) || chunk_is_token(second, CT_D_ARRAY_COLON))
+   if (  chunk_is_token(first, CT_D_ARRAY_COLON)
+      || chunk_is_token(second, CT_D_ARRAY_COLON))
    {
       // (D) Add or remove around the D named array initializer ':' operator.
       log_rule("sp_d_array_colon");
@@ -228,7 +237,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    if (  chunk_is_token(first, CT_CASE)
-      && ((CharTable::IsKw1(second->str[0]) || chunk_is_token(second, CT_NUMBER))))
+      && ((  CharTable::IsKw1(second->str[0])
+          || chunk_is_token(second, CT_NUMBER))))
    {
       // Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
       // sense here.
@@ -254,7 +264,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_before_for_colon());
    }
 
-   if (chunk_is_token(first, CT_QUESTION) && chunk_is_token(second, CT_COND_COLON))
+   if (  chunk_is_token(first, CT_QUESTION)
+      && chunk_is_token(second, CT_COND_COLON))
    {
       if (options::sp_cond_ternary_short() != IARF_IGNORE)
       {
@@ -266,7 +277,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_QUESTION) || chunk_is_token(second, CT_QUESTION))
+   if (  chunk_is_token(first, CT_QUESTION)
+      || chunk_is_token(second, CT_QUESTION))
    {
       if (  chunk_is_token(second, CT_QUESTION)
          && (options::sp_cond_question_before() != IARF_IGNORE))
@@ -292,7 +304,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_cond_question());
    }
 
-   if (chunk_is_token(first, CT_COND_COLON) || chunk_is_token(second, CT_COND_COLON))
+   if (  chunk_is_token(first, CT_COND_COLON)
+      || chunk_is_token(second, CT_COND_COLON))
    {
       if (  chunk_is_token(second, CT_COND_COLON)
          && (options::sp_cond_colon_before() != IARF_IGNORE))
@@ -318,16 +331,18 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_cond_colon());
    }
 
-   if (chunk_is_token(first, CT_RANGE) || chunk_is_token(second, CT_RANGE))
+   if (  chunk_is_token(first, CT_RANGE)
+      || chunk_is_token(second, CT_RANGE))
    {
       // (D) Add or remove space around the D '..' operator.
       log_rule("sp_range");
       return(options::sp_range());
    }
 
-   if (chunk_is_token(first, CT_COLON) && get_chunk_parent_type(first) == CT_SQL_EXEC)
+   if (  chunk_is_token(first, CT_COLON)
+      && get_chunk_parent_type(first) == CT_SQL_EXEC)
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
@@ -340,7 +355,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(arg | ((arg != IARF_IGNORE) ? IARF_ADD : IARF_IGNORE));
    }
 
-   if (chunk_is_token(first, CT_FPAREN_CLOSE) && get_chunk_parent_type(first) == CT_MACRO_FUNC)
+   if (  chunk_is_token(first, CT_FPAREN_CLOSE)
+      && get_chunk_parent_type(first) == CT_MACRO_FUNC)
    {
       // Add or remove space between a macro function ')' and its definition.
       log_rule("sp_macro_func");
@@ -354,15 +370,22 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (options::pp_space() == IARF_IGNORE)
       {
          log_rule("pp_space");
-         log_rule("IGNORE");
+         log_rule_short("IGNORE");
          return(IARF_IGNORE);
       }
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (chunk_is_token(second, CT_SEMICOLON))
    {
+      if (chunk_is_token(first, CT_VBRACE_OPEN))
+      {
+         // Add or remove space before ';'.
+         log_rule("sp_before_semi");
+         return(options::sp_before_semi());
+      }
+
       if (get_chunk_parent_type(second) == CT_FOR)
       {
          if (  chunk_is_token(first, CT_SPAREN_OPEN) // a
@@ -434,20 +457,20 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       switch (second->orig_prev_sp)
       {
       case 0:
-         log_rule("orig_prev_sp-REMOVE");
+         log_rule_short("orig_prev_sp-REMOVE");
          return(IARF_REMOVE);
 
       case 1:
-         log_rule("orig_prev_sp-FORCE");
+         log_rule_short("orig_prev_sp-FORCE");
          return(IARF_FORCE);
 
       default:
-         log_rule("orig_prev_sp-ADD");
+         log_rule_short("orig_prev_sp-ADD");
          return(IARF_ADD);
       }
    }
 
-   // "for (;;)" vs "for (;; )" and "for (a;b;c)" vs "for (a; b; c)"
+   // "for (;;)" vs. "for (;; )" and "for (a;b;c)" vs. "for (a; b; c)"
    if (chunk_is_token(first, CT_SEMICOLON))
    {
       if (get_chunk_parent_type(first) == CT_FOR)
@@ -469,7 +492,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
             return(options::sp_after_semi_for());
          }
       }
-      else if (!chunk_is_comment(second) && second->type != CT_BRACE_CLOSE) // issue #197
+      else if (  !chunk_is_comment(second)
+              && second->type != CT_BRACE_CLOSE) // issue #197
       {
          // Add or remove space after ';', except when followed by a comment.
          log_rule("sp_after_semi");
@@ -488,11 +512,11 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          || chunk_is_token(second, CT_ARITH)
          || chunk_is_token(second, CT_SHIFT)))
    {
-      log_rule("ADD");
+      log_rule_short("ADD");
       return(IARF_ADD);
    }
 
-   // "return(a);" vs "return (foo_t)a + 3;" vs "return a;" vs "return;"
+   // "return(a);" vs. "return (foo_t)a + 3;" vs. "return a;" vs. "return;"
    if (chunk_is_token(first, CT_RETURN))
    {
       if (  chunk_is_token(second, CT_PAREN_OPEN)
@@ -510,11 +534,11 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_return_brace());
       }
       // everything else requires a space
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
-   // "sizeof(foo_t)" vs "sizeof (foo_t)"
+   // "sizeof(foo_t)" vs. "sizeof (foo_t)"
    if (chunk_is_token(first, CT_SIZEOF))
    {
       if (chunk_is_token(second, CT_PAREN_OPEN))
@@ -530,11 +554,11 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_sizeof_ellipsis");
          return(options::sp_sizeof_ellipsis());
       }
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
-   // "decltype(foo_t)" vs "decltype (foo_t)"
+   // "decltype(foo_t)" vs. "decltype (foo_t)"
    if (chunk_is_token(first, CT_DECLTYPE))
    {
       if (chunk_is_token(second, CT_PAREN_OPEN))
@@ -543,7 +567,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_decltype_paren");
          return(options::sp_decltype_paren());
       }
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
@@ -597,25 +621,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       case CT_TYPENAME:
       case CT_UNION:
       case CT_USING:
-         log_rule("FORCE");
+         log_rule_short("FORCE");
          return(IARF_FORCE);
 
       default:
          break;
       }
 
-      // Issue #1005
-      /* '::' at the start of an identifier is not member access, but global scope operator.
-       * Detect if previous chunk is a type and previous-previous is "friend"
-       */
-      if (  chunk_is_token(first, CT_TYPE)
-         && first->prev != nullptr
-         && (first->prev->type == CT_FRIEND && first->next->type != CT_DC_MEMBER))
-      {
-         log_rule("FORCE");
-         return(IARF_FORCE);
-      }
-
       if (  (  chunk_is_token(first, CT_WORD)
             || chunk_is_token(first, CT_TYPE)
             || chunk_is_token(first, CT_PAREN_CLOSE)
@@ -628,12 +640,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
    }
 
-   // "a,b" vs "a, b"
+   // "a,b" vs. "a, b"
    if (chunk_is_token(first, CT_COMMA))
    {
       if (get_chunk_parent_type(first) == CT_TYPE)
       {
-         // C# multidimensional array type: ',,' vs ', ,' or ',]' vs ', ]'
+         // C# multidimensional array type: ',,' vs. ', ,' or ',]' vs. ', ]'
          if (chunk_is_token(second, CT_COMMA))
          {
             // (C#) Add or remove space between ',' in multidimensional array type
@@ -651,7 +663,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       // Don't add extra space after comma immediately followed by Angle close
       if (chunk_is_token(second, CT_ANGLE_CLOSE))
       {
-         log_rule("IGNORE");
+         log_rule_short("IGNORE");
          return(IARF_IGNORE);
       }
       // Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
@@ -663,7 +675,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (QT_SIGNAL_SLOT_found)
    {
       if (  chunk_is_token(first, CT_FPAREN_CLOSE)
-         && (chunk_is_token(second, CT_FPAREN_CLOSE) || chunk_is_token(second, CT_COMMA)))
+         && (  chunk_is_token(second, CT_FPAREN_CLOSE)
+            || chunk_is_token(second, CT_COMMA)))
       {
          if (second->level == QT_SIGNAL_SLOT_level)
          {
@@ -674,7 +687,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(second, CT_COMMA))
    {
-      if (chunk_is_token(first, CT_SQUARE_OPEN) && get_chunk_parent_type(first) == CT_TYPE)
+      if (  chunk_is_token(first, CT_SQUARE_OPEN)
+         && get_chunk_parent_type(first) == CT_TYPE)
       {
          // Only for C#.
          // (C#) Add or remove space between '[' and ',' in multidimensional array type
@@ -683,8 +697,9 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_before_mdatype_commas());
       }
 
-      if (  chunk_is_token(first, CT_PAREN_OPEN)
-         && (options::sp_paren_comma() != IARF_IGNORE))
+      if (  options::sp_paren_comma() != IARF_IGNORE
+         && (  chunk_is_token(first, CT_PAREN_OPEN)
+            || chunk_is_token(first, CT_FPAREN_OPEN)))
       {
          // Add or remove space between an open parenthesis and comma,
          // i.e. '(,' vs. '( ,'.
@@ -704,7 +719,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  chunk_is_token(tmp, CT_PTR_TYPE)
          || chunk_is_token(tmp, CT_BYREF))
       {
-         tmp = chunk_get_prev_ncnl(tmp);
+         tmp = chunk_get_prev_ncnnl(tmp);
       }
 
       if (  chunk_is_token(tmp, CT_TYPE)
@@ -735,7 +750,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
       if (chunk_is_token(first, CT_TAG_COLON))
       {
-         log_rule("FORCE");
+         log_rule_short("FORCE");
          return(IARF_FORCE);
       }
    }
@@ -744,12 +759,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    {
       if (CharTable::IsKw1(second->str[0]))
       {
-         log_rule("FORCE");
+         log_rule_short("FORCE");
          return(IARF_FORCE);
       }
 
       if (  chunk_is_token(second, CT_PAREN_OPEN)
-         && first->prev && chunk_is_token(first->prev, CT_SIZEOF))
+         && first->prev != nullptr
+         && chunk_is_token(first->prev, CT_SIZEOF))
       {
          // Add or remove space between 'sizeof...' and '('.
          log_rule("sp_sizeof_ellipsis_paren");
@@ -766,14 +782,14 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(second, CT_TAG_COLON))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    // handle '~'
    if (chunk_is_token(first, CT_DESTRUCTOR))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
@@ -789,9 +805,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && (chunk_is_token(first, CT_PAREN_CLOSE) || chunk_is_token(first, CT_OC_CLASS) || chunk_is_token(first, CT_WORD))
+      && (  chunk_is_token(first, CT_PAREN_CLOSE)
+         || chunk_is_token(first, CT_OC_CLASS)
+         || chunk_is_token(first, CT_WORD))
       && chunk_is_token(second, CT_ANGLE_OPEN)
-      && (get_chunk_parent_type(second) == CT_OC_PROTO_LIST || get_chunk_parent_type(second) == CT_OC_GENERIC_SPEC)
+      && (  get_chunk_parent_type(second) == CT_OC_PROTO_LIST
+         || get_chunk_parent_type(second) == CT_OC_GENERIC_SPEC)
       && (options::sp_before_oc_proto_list() != IARF_IGNORE))
    {
       // (OC) Add or remove space before Objective-C protocol list
@@ -842,7 +861,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    if (  language_is_set(LANG_OC)
-      && chunk_is_token(first, CT_SYNCHRONIZED) && chunk_is_token(second, CT_SPAREN_OPEN))
+      && chunk_is_token(first, CT_SYNCHRONIZED)
+      && chunk_is_token(second, CT_SPAREN_OPEN))
    {
       // (OC) Add or remove space between '@synchronized' and the open parenthesis,
       // i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
@@ -850,7 +870,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_oc_synchronized());
    }
 
-   // "if (" vs "if("
+   // "if (" vs. "if("
    if (chunk_is_token(second, CT_SPAREN_OPEN))
    {
       // Add or remove space before '(' of control statements ('if', 'for', 'switch',
@@ -859,8 +879,10 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_before_sparen());
    }
 
-   if (chunk_is_token(first, CT_LAMBDA) || chunk_is_token(second, CT_LAMBDA))
+   if (  chunk_is_token(first, CT_LAMBDA)
+      || chunk_is_token(second, CT_LAMBDA))
    {
+      // Add or remove space around assignment operator '=', '+=', etc.
       log_rule("sp_assign (lambda)");
       return(options::sp_assign());
    }
@@ -886,39 +908,61 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    {
       // Handle the special lambda case for C++11:
       //    [](Something arg){.....}
-      // Add or remove space after the capture specification in C++11 lambda.
-      if (  (options::sp_cpp_lambda_square_paren() != IARF_IGNORE)
-         && chunk_is_token(second, CT_FPAREN_OPEN))
+      // Add or remove space after the capture specification of a C++11 lambda when
+      // an argument list is present, as in '[] <here> (int x){ ... }'.
+      if (chunk_is_token(second, CT_LPAREN_OPEN))
       {
          log_rule("sp_cpp_lambda_square_paren");
          return(options::sp_cpp_lambda_square_paren());
       }
-      else if (  (options::sp_cpp_lambda_square_brace() != IARF_IGNORE)
-              && chunk_is_token(second, CT_BRACE_OPEN))
+      else if (chunk_is_token(second, CT_BRACE_OPEN))
       {
+         // Add or remove space after the capture specification of a C++11 lambda with
+         // no argument list is present, as in '[] <here> { ... }'.
          log_rule("sp_cpp_lambda_square_brace");
          return(options::sp_cpp_lambda_square_brace());
       }
    }
 
+   if (chunk_is_token(first, CT_LPAREN_OPEN))
+   {
+      // Add or remove space after the opening parenthesis of a argument list
+      // of a C++11 lambda, as in '[]( <here> int x ){ ... }'.
+      log_rule("sp_cpp_lambda_argument_list");
+      return(options::sp_cpp_lambda_argument_list());
+   }
+
+   if (chunk_is_token(first, CT_LPAREN_CLOSE))
+   {
+      if (chunk_is_token(second, CT_BRACE_OPEN))
+      {
+         // Add or remove space after the argument list of a C++11 lambda, as in
+         // '[](int x) <here> { ... }'.
+         log_rule("sp_cpp_lambda_paren_brace");
+         return(options::sp_cpp_lambda_paren_brace());
+      }
+   }
+
+   if (chunk_is_token(second, CT_LPAREN_CLOSE))
+   {
+      // Add or remove space before the closing parenthesis of a argument list
+      // of a C++11 lambda, as in '[]( int x <here> ){ ... }'.
+      log_rule("sp_cpp_lambda_argument_list");
+      return(options::sp_cpp_lambda_argument_list());
+   }
+
    if (  chunk_is_token(first, CT_BRACE_CLOSE)
       && get_chunk_parent_type(first) == CT_CPP_LAMBDA
       && chunk_is_token(second, CT_FPAREN_OPEN))
    {
+      // Add or remove space between a lambda body and its call operator of an
+      // immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
       log_rule("sp_cpp_lambda_fparen");
       return(options::sp_cpp_lambda_fparen());
    }
 
-   if (  (options::sp_cpp_lambda_paren_brace() != IARF_IGNORE)
-      && chunk_is_token(first, CT_FPAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_CPP_LAMBDA
-      && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule("sp_cpp_lambda_paren_brace");
-      return(options::sp_cpp_lambda_paren_brace());
-   }
-
-   if (chunk_is_token(first, CT_ENUM) && chunk_is_token(second, CT_FPAREN_OPEN))
+   if (  chunk_is_token(first, CT_ENUM)
+      && chunk_is_token(second, CT_FPAREN_OPEN))
    {
       // Add or remove space in 'NS_ENUM ('.
       if (options::sp_enum_paren() != IARF_IGNORE)
@@ -967,6 +1011,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(second, CT_ASSIGN_DEFAULT_ARG))
    {
+      // Add or remove space around assignment operator '=' in a prototype.
+      // If set to ignore, use sp_assign.
       if (  (options::sp_assign_default() != IARF_IGNORE)
          && get_chunk_parent_type(second) == CT_FUNC_PROTO)
       {
@@ -974,11 +1020,14 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_assign_default());
       }
 
+      // Add or remove space before assignment operator '=', '+=', etc.
+      // Overrides sp_assign.
       if (options::sp_before_assign() != IARF_IGNORE)
       {
          log_rule("sp_before_assign");
          return(options::sp_before_assign());
       }
+      // Add or remove space around assignment operator '=', '+=', etc.
       log_rule("sp_assign");
       return(options::sp_assign());
    }
@@ -999,6 +1048,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_enum_assign());
       }
 
+      // Add or remove space around assignment operator '=' in a prototype.
+      // If set to ignore, use sp_assign.
       if (  (options::sp_assign_default() != IARF_IGNORE)
          && get_chunk_parent_type(first) == CT_FUNC_PROTO)
       {
@@ -1013,6 +1064,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_after_assign");
          return(options::sp_after_assign());
       }
+      // Add or remove space around assignment operator '=', '+=', etc.
       log_rule("sp_assign");
       return(options::sp_assign());
    }
@@ -1029,6 +1081,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_ASSIGN_DEFAULT_ARG))
    {
+      // Add or remove space around assignment operator '=' in a prototype.
+      // If set to ignore, use sp_assign.
       if (  (options::sp_assign_default() != IARF_IGNORE)
          && get_chunk_parent_type(first) == CT_FUNC_PROTO)
       {
@@ -1043,13 +1097,15 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_after_assign");
          return(options::sp_after_assign());
       }
+      // Add or remove space around assignment operator '=', '+=', etc.
       log_rule("sp_assign");
       return(options::sp_assign());
    }
 
    if (chunk_is_token(first, CT_BIT_COLON))
    {
-      if (first->flags.test(PCF_IN_ENUM))
+      if (  first->flags.test(PCF_IN_ENUM)
+         || first->parent_type == CT_ENUM)
       {
          // Add or remove space around assignment ':' in enum.
          log_rule("sp_enum_colon");
@@ -1059,7 +1115,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(second, CT_BIT_COLON))
    {
-      if (second->flags.test(PCF_IN_ENUM))
+      if (  second->flags.test(PCF_IN_ENUM)
+         || second->parent_type == CT_ENUM)
       {
          // Add or remove space around assignment ':' in enum.
          log_rule("sp_enum_colon");
@@ -1067,9 +1124,10 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
    }
 
-   if (chunk_is_token(first, CT_OC_AVAILABLE_VALUE) || chunk_is_token(second, CT_OC_AVAILABLE_VALUE))
+   if (  chunk_is_token(first, CT_OC_AVAILABLE_VALUE)
+      || chunk_is_token(second, CT_OC_AVAILABLE_VALUE))
    {
-      log_rule("IGNORE");
+      log_rule_short("IGNORE");
       return(IARF_IGNORE);
    }
 
@@ -1096,7 +1154,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
             && (first->type != CT_FPAREN_CLOSE)
             && (first->type != CT_PAREN_CLOSE)))
       {
-         log_rule("FORCE");
+         log_rule_short("FORCE");
          return(IARF_FORCE);
       }
       // (OC) Add or remove space between the receiver and selector in a message,
@@ -1105,7 +1163,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_oc_msg_receiver());
    }
 
-   // c++17 structured bindings e.g., "auto [x, y, z]" vs a[x, y, z]" or "auto const [x, y, z]" vs "auto const[x, y, z]"
+   // c++17 structured bindings e.g., "auto [x, y, z]" vs. a[x, y, z]" or "auto const [x, y, z]" vs. "auto const[x, y, z]"
    if (  language_is_set(LANG_CPP)
       && (  chunk_is_token(first, CT_BYREF)
          || chunk_is_token(first, CT_QUALIFIER)
@@ -1119,15 +1177,16 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_cpp_before_struct_binding());
    }
 
-   // "a [x]" vs "a[x]"
+   // "a [x]" vs. "a[x]"
    if (  chunk_is_token(second, CT_SQUARE_OPEN)
       && (  get_chunk_parent_type(second) != CT_OC_MSG
          && get_chunk_parent_type(second) != CT_CS_SQ_STMT
          && get_chunk_parent_type(second) != CT_CPP_LAMBDA))
    {
-      if (second->flags.test(PCF_IN_SPAREN) && (chunk_is_token(first, CT_IN)))
+      if (  second->flags.test(PCF_IN_SPAREN)
+         && (chunk_is_token(first, CT_IN)))
       {
-         log_rule("FORCE");
+         log_rule_short("FORCE");
          return(IARF_FORCE);
       }
 
@@ -1149,7 +1208,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_before_square());
    }
 
-   // "byte[]" vs "byte []"
+   // "byte[]" vs. "byte []"
    if (chunk_is_token(second, CT_TSQUARE))
    {
       // Add or remove space before '[]'.
@@ -1214,7 +1273,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_ANGLE_CLOSE))
    {
-      if (chunk_is_token(second, CT_WORD) || CharTable::IsKw1(second->str[0]))
+      if (  chunk_is_token(second, CT_WORD)
+         || CharTable::IsKw1(second->str[0]))
       {
          // Add or remove space between '>' and a word as in 'List<byte> m;' or
          // 'template <typename T> static ...'.
@@ -1225,9 +1285,10 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          }
       }
 
-      if (chunk_is_token(second, CT_FPAREN_OPEN) || chunk_is_token(second, CT_PAREN_OPEN))
+      if (  chunk_is_token(second, CT_FPAREN_OPEN)
+         || chunk_is_token(second, CT_PAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnl(second);
+         chunk_t *next = chunk_get_next_ncnnl(second);
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1260,9 +1321,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
             return(options::sp_angle_colon());
          }
 
+         // Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
+         // historic behavior, but is probably not the desired behavior, so this is off
+         // by default.
          if (  chunk_is_token(second, CT_FPAREN_CLOSE)
             && options::sp_inside_fparen() != IARF_IGNORE
-            && options::use_sp_after_angle_always() == false)
+            && !options::use_sp_after_angle_always())
          {
             // Add or remove space between '>' and ')'.
             log_rule("sp_inside_fparen");
@@ -1322,7 +1386,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       {
          chunk_t *next = chunk_get_next_nc(second);
 
-         if (next != nullptr && next->type != CT_WORD)
+         if (  next != nullptr
+            && next->type != CT_WORD)
          {
             log_rule("sp_before_unnamed_byref");
             return(options::sp_before_unnamed_byref());
@@ -1339,11 +1404,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       {
          if (get_chunk_parent_type(second) == CT_CATCH)
          {
-            if (language_is_set(LANG_OC) && (options::sp_oc_catch_brace() != IARF_IGNORE))
+            if (  language_is_set(LANG_OC)
+               && (options::sp_oc_catch_brace() != IARF_IGNORE))
             {
                // (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.
+               // only to help the vim command }}
                log_rule("sp_oc_catch_brace");
                return(options::sp_oc_catch_brace());
             }
@@ -1374,14 +1441,6 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
    }
 
-   if (  chunk_is_token(first, CT_VBRACE_OPEN)
-      && chunk_is_token(second, CT_SEMICOLON)) // Issue # 1158
-   {
-      // Add or remove space before ';'.
-      log_rule("sp_before_semi");
-      return(options::sp_before_semi());
-   }
-
    if (  chunk_is_token(second, CT_FPAREN_OPEN)
       && get_chunk_parent_type(first) == CT_OPERATOR
       && (options::sp_after_operator_sym() != IARF_IGNORE))
@@ -1389,7 +1448,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_after_operator_sym_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnl(second);
+         chunk_t *next = chunk_get_next_ncnnl(second);
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1420,6 +1479,21 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
    }
 
+   if (  chunk_is_token(first, CT_MACRO_OPEN)
+      || chunk_is_token(first, CT_MACRO_CLOSE)
+      || chunk_is_token(first, CT_MACRO_ELSE))
+   {
+      if (chunk_is_token(second, CT_FPAREN_OPEN))
+      {
+         // TODO: provide some test data to check this block
+         // Add or remove space between function name and '(' on function calls.
+         log_rule("sp_func_call_paren");
+         return(options::sp_func_call_paren());
+      }
+      log_rule_short("IGNORE");
+      return(IARF_IGNORE);
+   }
+
    // spaces between function and open paren
    if (  chunk_is_token(first, CT_FUNC_CALL)
       || chunk_is_token(first, CT_FUNC_CTOR_VAR)
@@ -1432,7 +1506,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_func_call_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnl(second);
+         chunk_t *next = chunk_get_next_ncnnl(second);
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1457,7 +1531,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_func_call_user_paren());
    }
 
-   if (chunk_is_token(first, CT_ATTRIBUTE) && chunk_is_paren_open(second))
+   if (  chunk_is_token(first, CT_ATTRIBUTE)
+      && chunk_is_paren_open(second))
    {
       // Add or remove space between '__attribute__' and '('.
       log_rule("sp_attribute_paren");
@@ -1469,7 +1544,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_func_def_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnl(second);
+         chunk_t *next = chunk_get_next_ncnnl(second);
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1484,7 +1559,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_func_def_paren());
    }
 
-   if (chunk_is_token(first, CT_CPP_CAST) || chunk_is_token(first, CT_TYPE_WRAP))
+   if (  chunk_is_token(first, CT_CPP_CAST)
+      || chunk_is_token(first, CT_TYPE_WRAP))
    {
       // Add or remove space between the type and open parenthesis in a C++ cast,
       // i.e. 'int(exp)' vs. 'int (exp)'.
@@ -1492,17 +1568,21 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_cpp_cast_paren());
    }
 
-   if (chunk_is_token(first, CT_SPAREN_CLOSE) && chunk_is_token(second, CT_WHEN))
+   if (  chunk_is_token(first, CT_SPAREN_CLOSE)
+      && chunk_is_token(second, CT_WHEN))
    {
-      log_rule("FORCE");
+      // TODO: provide some test data to check this block
+      log_rule_short("FORCE");
       return(IARF_FORCE); // TODO: make this configurable?
    }
 
    if (  chunk_is_token(first, CT_PAREN_CLOSE)
-      && (chunk_is_token(second, CT_PAREN_OPEN) || chunk_is_token(second, CT_FPAREN_OPEN)))
+      && (  chunk_is_token(second, CT_PAREN_OPEN)
+         || chunk_is_token(second, CT_FPAREN_OPEN)))
    {
-      // "(int)a" vs "(int) a" or "cast(int)a" vs "cast(int) a"
-      if (get_chunk_parent_type(first) == CT_C_CAST || get_chunk_parent_type(first) == CT_D_CAST)
+      // "(int)a" vs. "(int) a" or "cast(int)a" vs. "cast(int) a"
+      if (  get_chunk_parent_type(first) == CT_C_CAST
+         || get_chunk_parent_type(first) == CT_D_CAST)
       {
          // Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
          // '(int)a' vs. '(int) a'.
@@ -1510,7 +1590,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_after_cast());
       }
       // Must be an indirect/chained function call?
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);  // TODO: make this configurable?
    }
 
@@ -1523,10 +1603,11 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_tparen_close());
    }
 
-   // ")(" vs ") ("
+   // ")(" vs. ") ("
    if (  (  chunk_is_str(first, ")", 1)
          && chunk_is_str(second, "(", 1))
-      || (chunk_is_paren_close(first) && chunk_is_paren_open(second)))
+      || (  chunk_is_paren_close(first)
+         && chunk_is_paren_open(second)))
    {
       // Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
       log_rule("sp_cparen_oparen");
@@ -1540,7 +1621,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_func_proto_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnl(second);
+         chunk_t *next = chunk_get_next_ncnnl(second);
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1564,12 +1645,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_func_type_paren());
    }
 
-   if (chunk_is_token(first, CT_FUNC_CLASS_DEF) || chunk_is_token(first, CT_FUNC_CLASS_PROTO))
+   if (  chunk_is_token(first, CT_FUNC_CLASS_DEF)
+      || chunk_is_token(first, CT_FUNC_CLASS_PROTO))
    {
       if (  (options::sp_func_class_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnl(second);
+         chunk_t *next = chunk_get_next_ncnnl(second);
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1585,13 +1667,15 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_func_class_paren());
    }
 
-   if (chunk_is_token(first, CT_CLASS) && !first->flags.test(PCF_IN_OC_MSG))
+   if (  chunk_is_token(first, CT_CLASS)
+      && !first->flags.test(PCF_IN_OC_MSG))
    {
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
-   if (chunk_is_token(first, CT_BRACE_OPEN) && chunk_is_token(second, CT_BRACE_CLOSE))
+   if (  chunk_is_token(first, CT_BRACE_OPEN)
+      && chunk_is_token(second, CT_BRACE_CLOSE))
    {
       // Add or remove space inside '{}'.
       log_rule("sp_inside_braces_empty");
@@ -1603,12 +1687,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       && chunk_is_token(second, CT_BRACE_OPEN)
       && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
    {
-      auto arg = iarf_flags_t{ options::sp_type_brace_init_lst() };
+      iarf_flags_t arg = iarf_flags_t{ options::sp_type_brace_init_lst() };
 
-      if (  arg != iarf_e::IGNORE
+      if (  arg != IARF_IGNORE
          || get_chunk_parent_type(first) != CT_DECLTYPE)
       {
-         // 'int{9}' vs 'int {9}'
+         // 'int{9}' vs. 'int {9}'
          // Add or remove space between type and open brace of an unnamed temporary
          // direct-list-initialization.
          log_rule("sp_type_brace_init_lst");
@@ -1622,12 +1706,14 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       && chunk_is_token(second, CT_BRACE_OPEN)
       && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
    {
+      // Add or remove space between a variable and '{' for C++ uniform
+      // initialization.
       auto arg = iarf_flags_t{ options::sp_word_brace_init_lst() };
 
-      if (  arg != iarf_e::IGNORE
+      if (  arg != IARF_IGNORE
          || get_chunk_parent_type(first) != CT_DECLTYPE)
       {
-         // 'a{9}' vs 'a {9}'
+         // 'a{9}' vs. 'a {9}'
          // Add or remove space between variable/word and open brace of an unnamed
          // temporary direct-list-initialization.
          log_rule("sp_word_brace_init_lst");
@@ -1644,14 +1730,16 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_inside_braces_enum());
       }
 
-      if (get_chunk_parent_type(second) == CT_STRUCT || get_chunk_parent_type(second) == CT_UNION)
+      if (  get_chunk_parent_type(second) == CT_STRUCT
+         || get_chunk_parent_type(second) == CT_UNION)
       {
          // Fix for issue #1240  adding space in struct initializers
-         chunk_t *tmp = chunk_get_prev_ncnl(chunk_skip_to_match_rev(second));
+         chunk_t *tmp = chunk_get_prev_ncnnl(chunk_skip_to_match_rev(second));
 
          if (chunk_is_token(tmp, CT_ASSIGN))
          {
-            log_rule("IGNORE");
+            // TODO: provide some test data to check this block
+            log_rule_short("IGNORE");
             return(IARF_IGNORE);
          }
          // Add or remove space inside struct/union '{' and '}'.
@@ -1668,7 +1756,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
       if (get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
       {
-         // Add or remove space between nested braces, i.e. '{{' vs '{ {'.
+         // Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+         // only to help the vim command }}}}
          if (  options::sp_brace_brace() != IARF_IGNORE
             && chunk_is_token(first, CT_BRACE_CLOSE)
             && get_chunk_parent_type(first) == CT_BRACED_INIT_LIST)
@@ -1699,11 +1788,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_D_CAST))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_PP_DEFINED) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_PP_DEFINED)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
       // Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
       log_rule("sp_defined_paren");
@@ -1724,26 +1814,30 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_throw());
    }
 
-   if (chunk_is_token(first, CT_THIS) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_THIS)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
       // Add or remove space between 'this' and '(' in 'this (something)'.
       log_rule("sp_this_paren");
       return(options::sp_this_paren());
    }
 
-   if (chunk_is_token(first, CT_STATE) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_STATE)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
-      log_rule("ADD");
+      log_rule_short("ADD");
       return(IARF_ADD);
    }
 
-   if (chunk_is_token(first, CT_DELEGATE) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_DELEGATE)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_MEMBER) || chunk_is_token(second, CT_MEMBER))
+   if (  chunk_is_token(first, CT_MEMBER)
+      || chunk_is_token(second, CT_MEMBER))
    {
       // Add or remove space around the '.' or '->' operators.
       log_rule("sp_member");
@@ -1753,22 +1847,25 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (chunk_is_token(first, CT_C99_MEMBER))
    {
       // always remove space(s) after then '.' of a C99-member
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_SUPER) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_SUPER)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
       // Add or remove space between 'super' and '(' in 'super (something)'.
       log_rule("sp_super_paren");
       return(options::sp_super_paren());
    }
 
-   if (chunk_is_token(first, CT_FPAREN_CLOSE) && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  chunk_is_token(first, CT_FPAREN_CLOSE)
+      && chunk_is_token(second, CT_BRACE_OPEN))
    {
       if (get_chunk_parent_type(second) == CT_DOUBLE_BRACE)
       {
          // (Java) Add or remove space between ')' and '{{' of double brace initializer.
+         // only to help the vim command }}
          log_rule("sp_fparen_dbrace");
          return(options::sp_fparen_dbrace());
       }
@@ -1778,7 +1875,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (get_chunk_parent_type(first) == CT_FUNC_CALL)
       {
          chunk_t *tmp = chunk_get_prev_type(first, get_chunk_parent_type(first), first->level);
-         tmp = chunk_get_prev_ncnl(tmp);
+         tmp = chunk_get_prev_ncnnl(tmp);
 
          if (chunk_is_token(tmp, CT_NEW))
          {
@@ -1794,40 +1891,46 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_fparen_brace());
    }
 
-   if (chunk_is_token(first, CT_D_TEMPLATE) || chunk_is_token(second, CT_D_TEMPLATE))
+   if (  chunk_is_token(first, CT_D_TEMPLATE)
+      || chunk_is_token(second, CT_D_TEMPLATE))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
-   if (chunk_is_token(first, CT_ELSE) && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  chunk_is_token(first, CT_ELSE)
+      && chunk_is_token(second, CT_BRACE_OPEN))
    {
       // Add or remove space between 'else' and '{' if on the same line.
       log_rule("sp_else_brace");
       return(options::sp_else_brace());
    }
 
-   if (chunk_is_token(first, CT_ELSE) && chunk_is_token(second, CT_ELSEIF))
+   if (  chunk_is_token(first, CT_ELSE)
+      && chunk_is_token(second, CT_ELSEIF))
    {
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
-   if (chunk_is_token(first, CT_FINALLY) && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  chunk_is_token(first, CT_FINALLY)
+      && chunk_is_token(second, CT_BRACE_OPEN))
    {
       // Add or remove space between 'finally' and '{' if on the same line.
       log_rule("sp_finally_brace");
       return(options::sp_finally_brace());
    }
 
-   if (chunk_is_token(first, CT_TRY) && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  chunk_is_token(first, CT_TRY)
+      && chunk_is_token(second, CT_BRACE_OPEN))
    {
       // Add or remove space between 'try' and '{' if on the same line.
       log_rule("sp_try_brace");
       return(options::sp_try_brace());
    }
 
-   if (chunk_is_token(first, CT_GETSET) && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  chunk_is_token(first, CT_GETSET)
+      && chunk_is_token(second, CT_BRACE_OPEN))
    {
       // Add or remove space between get/set and '{' if on the same line.
       log_rule("sp_getset_brace");
@@ -1843,25 +1946,18 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_word_brace_ns");
          return(options::sp_word_brace_ns());
       }
-
-      if (  get_chunk_parent_type(first) == CT_NONE
-         && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
-      {
-         // Add or remove space between a variable and '{' for C++ uniform
-         // initialization.
-         log_rule("sp_word_brace_init_lst");
-         return(options::sp_word_brace_init_lst());
-      }
    }
 
-   if (chunk_is_token(second, CT_PAREN_OPEN) && get_chunk_parent_type(second) == CT_INVARIANT)
+   if (  chunk_is_token(second, CT_PAREN_OPEN)
+      && get_chunk_parent_type(second) == CT_INVARIANT)
    {
       // (D) Add or remove space between 'invariant' and '('.
       log_rule("sp_invariant_paren");
       return(options::sp_invariant_paren());
    }
 
-   if (chunk_is_token(first, CT_PAREN_CLOSE) && get_chunk_parent_type(first) != CT_DECLTYPE)
+   if (  chunk_is_token(first, CT_PAREN_CLOSE)
+      && get_chunk_parent_type(first) != CT_DECLTYPE)
    {
       if (get_chunk_parent_type(first) == CT_INVARIANT)
       {
@@ -1870,7 +1966,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_after_invariant_paren());
       }
 
-      // "(struct foo) {...}" vs "(struct foo){...}"
+      // "(struct foo) {...}" vs. "(struct foo){...}"
       if (chunk_is_token(second, CT_BRACE_OPEN))
       {
          // Add or remove space between ')' and '{'.
@@ -1881,14 +1977,14 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       // D-specific: "delegate(some thing) dg
       if (get_chunk_parent_type(first) == CT_DELEGATE)
       {
-         log_rule("ADD");
+         log_rule_short("ADD");
          return(IARF_ADD);
       }
 
       // PAWN-specific: "state (condition) next"
       if (get_chunk_parent_type(first) == CT_STATE)
       {
-         log_rule("ADD");
+         log_rule_short("ADD");
          return(IARF_ADD);
       }
 
@@ -1901,10 +1997,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
    }
 
-   /* "((" vs "( (" or "))" vs ") )" */
+   /* "((" vs. "( (" or "))" vs. ") )" */
    // Issue #1342
-   if (  (chunk_is_str(first, "(", 1) && chunk_is_str(second, "(", 1))
-      || (chunk_is_str(first, ")", 1) && chunk_is_str(second, ")", 1)))
+   if (  (  chunk_is_str(first, "(", 1)
+         && chunk_is_str(second, "(", 1))
+      || (  chunk_is_str(first, ")", 1)
+         && chunk_is_str(second, ")", 1)))
    {
       if (get_chunk_parent_type(second) == CT_FUNC_CALL_USER)
       {
@@ -1918,19 +2016,22 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_paren_paren());
    }
 
-   // "foo(...)" vs "foo( ... )"
-   if (chunk_is_token(first, CT_FPAREN_OPEN) || chunk_is_token(second, CT_FPAREN_CLOSE))
+   // "foo(...)" vs. "foo( ... )"
+   if (  chunk_is_token(first, CT_FPAREN_OPEN)
+      || chunk_is_token(second, CT_FPAREN_CLOSE))
    {
       if (  (get_chunk_parent_type(first) == CT_FUNC_CALL_USER)
          || (  (get_chunk_parent_type(second) == CT_FUNC_CALL_USER)
-            && ((chunk_is_token(first, CT_WORD)) || (chunk_is_token(first, CT_SQUARE_CLOSE)))))
+            && (  (chunk_is_token(first, CT_WORD))
+               || (chunk_is_token(first, CT_SQUARE_CLOSE)))))
       {
          // Add or remove space inside user function '(' and ')'.
          log_rule("sp_func_call_user_inside_fparen");
          return(options::sp_func_call_user_inside_fparen());
       }
 
-      if (chunk_is_token(first, CT_FPAREN_OPEN) && chunk_is_token(second, CT_FPAREN_CLOSE))
+      if (  chunk_is_token(first, CT_FPAREN_OPEN)
+         && chunk_is_token(second, CT_FPAREN_CLOSE))
       {
          // Add or remove space inside empty function '()'.
          log_rule("sp_inside_fparens");
@@ -1941,8 +2042,9 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_inside_fparen());
    }
 
-   // "foo(...)" vs "foo( ... )"
-   if (chunk_is_token(first, CT_TPAREN_OPEN) || chunk_is_token(second, CT_TPAREN_CLOSE))
+   // "foo(...)" vs. "foo( ... )"
+   if (  chunk_is_token(first, CT_TPAREN_OPEN)
+      || chunk_is_token(second, CT_TPAREN_CLOSE))
    {
       // Add or remove space inside the first parentheses in a function type, as in
       // 'void (*x)(...)'.
@@ -1962,7 +2064,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_after_oc_return_type());
       }
 
-      if (get_chunk_parent_type(first) == CT_OC_MSG_SPEC || get_chunk_parent_type(first) == CT_OC_MSG_DECL)
+      if (  get_chunk_parent_type(first) == CT_OC_MSG_SPEC
+         || get_chunk_parent_type(first) == CT_OC_MSG_DECL)
       {
          // (OC) Add or remove space after the (type) in message specs,
          // i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
@@ -1970,7 +2073,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_after_oc_type());
       }
 
-      if (get_chunk_parent_type(first) == CT_OC_SEL && second->type != CT_SQUARE_CLOSE)
+      if (  get_chunk_parent_type(first) == CT_OC_SEL
+         && second->type != CT_SQUARE_CLOSE)
       {
          // (OC) Add or remove space between '@selector(x)' and the following word,
          // i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
@@ -1997,7 +2101,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    if (  chunk_is_token(second, CT_PAREN_OPEN)
-      && (chunk_is_token(first, CT_OC_SEL) || chunk_is_token(first, CT_OC_PROTOCOL)))
+      && (  chunk_is_token(first, CT_OC_SEL)
+         || chunk_is_token(first, CT_OC_PROTOCOL)))
    {
       // (OC) Add or remove space between '@selector' and '(',
       // i.e. '@selector(msgName)' vs. '@selector (msgName)'.
@@ -2007,9 +2112,9 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    /*
-    * C cast:   "(int)"      vs "( int )"
-    * D cast:   "cast(int)"  vs "cast( int )"
-    * CPP cast: "int(a + 3)" vs "int( a + 3 )"
+    * C cast:   "(int)"      vs. "( int )"
+    * D cast:   "cast(int)"  vs. "cast( int )"
+    * CPP cast: "int(a + 3)" vs. "int( a + 3 )"
     */
    if (chunk_is_token(first, CT_PAREN_OPEN))
    {
@@ -2088,12 +2193,15 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_inside_square_empty());
    }
 
-   // "[3]" vs "[ 3 ]" or for objective-c "@[@3]" vs "@[ @3 ]"
-   if (chunk_is_token(first, CT_SQUARE_OPEN) || chunk_is_token(second, CT_SQUARE_CLOSE))
+   // "[3]" vs. "[ 3 ]" or for objective-c "@[@3]" vs. "@[ @3 ]"
+   if (  chunk_is_token(first, CT_SQUARE_OPEN)
+      || chunk_is_token(second, CT_SQUARE_CLOSE))
    {
       if (  language_is_set(LANG_OC)
-         && (  (get_chunk_parent_type(first) == CT_OC_AT && chunk_is_token(first, CT_SQUARE_OPEN))
-            || (get_chunk_parent_type(second) == CT_OC_AT && chunk_is_token(second, CT_SQUARE_CLOSE)))
+         && (  (  get_chunk_parent_type(first) == CT_OC_AT
+               && chunk_is_token(first, CT_SQUARE_OPEN))
+            || (  get_chunk_parent_type(second) == CT_OC_AT
+               && chunk_is_token(second, CT_SQUARE_CLOSE)))
          && (options::sp_inside_square_oc_array() != IARF_IGNORE))
       {
          // (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
@@ -2106,14 +2214,15 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_inside_square());
    }
 
-   if (chunk_is_token(first, CT_SQUARE_CLOSE) && chunk_is_token(second, CT_FPAREN_OPEN))
+   if (  chunk_is_token(first, CT_SQUARE_CLOSE)
+      && chunk_is_token(second, CT_FPAREN_OPEN))
    {
       // Add or remove space between ']' and '(' when part of a function call.
       log_rule("sp_square_fparen");
       return(options::sp_square_fparen());
    }
 
-   // "if(...)" vs "if( ... )"
+   // "if(...)" vs. "if( ... )"
    if (  chunk_is_token(second, CT_SPAREN_CLOSE)
       && (options::sp_inside_sparen_close() != IARF_IGNORE))
    {
@@ -2132,7 +2241,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_inside_sparen_open());
    }
 
-   if (chunk_is_token(first, CT_SPAREN_OPEN) || chunk_is_token(second, CT_SPAREN_CLOSE))
+   if (  chunk_is_token(first, CT_SPAREN_OPEN)
+      || chunk_is_token(second, CT_SPAREN_CLOSE))
    {
       // Add or remove space inside '(' and ')' of control statements.
       log_rule("sp_inside_sparen");
@@ -2141,12 +2251,17 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_CLASS_COLON))
    {
+      //chunk_t *a = chunk_get_prev_type(first, CT_OC_INTF, first->level, scope_e::ALL);
+      //chunk_t *b = chunk_get_prev_type(first, CT_OC_IMPL, first->level, scope_e::ALL);
+      //bool B_a = a != nullptr;
+      //bool B_b = b != nullptr;
       if (  get_chunk_parent_type(first) == CT_OC_CLASS
          && (  !chunk_get_prev_type(first, CT_OC_INTF, first->level, scope_e::ALL)
             && !chunk_get_prev_type(first, CT_OC_IMPL, first->level, scope_e::ALL)))
       {
          if (options::sp_after_oc_colon() != IARF_IGNORE)
          {
+            // TODO: provide some test data to check this block
             // (OC) Add or remove space after the colon in message specs,
             // i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
             log_rule("sp_after_oc_colon");
@@ -2168,10 +2283,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          && (  !chunk_get_prev_type(second, CT_OC_INTF, second->level, scope_e::ALL)
             && !chunk_get_prev_type(second, CT_OC_IMPL, second->level, scope_e::ALL)))
       {
-         if (get_chunk_parent_type(second) == CT_OC_CLASS && !chunk_get_prev_type(second, CT_OC_INTF, second->level, scope_e::ALL))
+         if (  get_chunk_parent_type(second) == CT_OC_CLASS
+            && !chunk_get_prev_type(second, CT_OC_INTF, second->level, scope_e::ALL))
          {
             if (options::sp_before_oc_colon() != IARF_IGNORE)
             {
+               // TODO: provide some test data to check this block
                // (OC) Add or remove space before the colon in message specs,
                // i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
                log_rule("sp_before_oc_colon");
@@ -2216,18 +2333,21 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_DOT))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (chunk_is_token(second, CT_DOT))
    {
-      log_rule("ADD");
+      log_rule_short("ADD");
       return(IARF_ADD);
    }
 
-   if (chunk_is_token(first, CT_NULLCOND) || chunk_is_token(second, CT_NULLCOND))
+   if (  chunk_is_token(first, CT_NULLCOND)
+      || chunk_is_token(second, CT_NULLCOND))
    {
+      // TODO: provide some test data to check this block
+      // LANG_CS  null conditional operator
       // Add or remove space around the '.' or '->' operators.
       log_rule("sp_member");
       return(options::sp_member());
@@ -2249,7 +2369,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
                            || chunk_is_token(first, CT_CARET))
                            ? first->str[0] : second->str[0];
 
-         if (arith_char == '+' || arith_char == '-')
+         if (  arith_char == '+'
+            || arith_char == '-')
          {
             log_rule("sp_arith_additive");
             return(options::sp_arith_additive());
@@ -2261,7 +2382,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_arith());
    }
 
-   if (chunk_is_token(first, CT_BOOL) || chunk_is_token(second, CT_BOOL))
+   if (  chunk_is_token(first, CT_BOOL)
+      || chunk_is_token(second, CT_BOOL))
    {
       // Add or remove space around boolean operators '&&' and '||'.
       iarf_e arg = options::sp_bool();
@@ -2277,22 +2399,26 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(arg);
    }
 
-   if (chunk_is_token(first, CT_COMPARE) || chunk_is_token(second, CT_COMPARE))
+   if (  chunk_is_token(first, CT_COMPARE)
+      || chunk_is_token(second, CT_COMPARE))
    {
       // Add or remove space around compare operator '<', '>', '==', etc.
       log_rule("sp_compare");
       return(options::sp_compare());
    }
 
-   if (chunk_is_token(first, CT_PAREN_OPEN) && chunk_is_token(second, CT_PTR_TYPE))
+   if (  chunk_is_token(first, CT_PAREN_OPEN)
+      && chunk_is_token(second, CT_PTR_TYPE))
    {
-      log_rule("REMOVE");
+      // TODO: provide some test data to check this block
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (  chunk_is_token(first, CT_PTR_TYPE)
       && (options::sp_ptr_star_paren() != IARF_IGNORE)
-      && (chunk_is_token(second, CT_FPAREN_OPEN) || chunk_is_token(second, CT_TPAREN_OPEN)))
+      && (  chunk_is_token(second, CT_FPAREN_OPEN)
+         || chunk_is_token(second, CT_TPAREN_OPEN)))
    {
       // Add or remove space after a pointer star '*', if followed by an open
       // parenthesis, as in 'void* (*)().
@@ -2321,7 +2447,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_ptr_star_func());
    }
 
-   if (chunk_is_token(first, CT_PTR_TYPE) && CharTable::IsKw1(second->str[0]))
+   if (  chunk_is_token(first, CT_PTR_TYPE)
+      && CharTable::IsKw1(second->str[0]))
    {
       chunk_t *prev = chunk_get_prev(first);
 
@@ -2366,12 +2493,14 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_ptr_star());
    }
 
-   if (chunk_is_token(second, CT_PTR_TYPE) && first->type != CT_IN)
+   if (  chunk_is_token(second, CT_PTR_TYPE)
+      && first->type != CT_IN)
    {
-      if (language_is_set(LANG_CS) && chunk_is_nullable(second))
+      if (  language_is_set(LANG_CS)
+         && chunk_is_nullable(second))
       {
          min_sp = 0;
-         log_rule("REMOVE");
+         log_rule_short("REMOVE");
          return(IARF_REMOVE);
       }
 
@@ -2387,7 +2516,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
             next = chunk_get_next(next);
          } while (chunk_is_token(next, CT_PTR_TYPE));
 
-         if (chunk_is_token(next, CT_FUNC_DEF) || chunk_is_token(next, CT_FUNC_PROTO))
+         if (  chunk_is_token(next, CT_FUNC_DEF)
+            || chunk_is_token(next, CT_FUNC_PROTO))
          {
             log_rule("sp_before_ptr_star_func");
             return(options::sp_before_ptr_star_func());
@@ -2405,7 +2535,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
             next = chunk_get_next_nc(next);
          }
 
-         if (next != nullptr && next->type != CT_WORD)
+         if (  next != nullptr
+            && next->type != CT_WORD)
          {
             log_rule("sp_before_unnamed_ptr_star");
             return(options::sp_before_unnamed_ptr_star());
@@ -2427,9 +2558,11 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_operator());
    }
 
-   if (chunk_is_token(second, CT_FUNC_PROTO) || chunk_is_token(second, CT_FUNC_DEF))
+   if (  chunk_is_token(second, CT_FUNC_PROTO)
+      || chunk_is_token(second, CT_FUNC_DEF))
    {
-      if (first->type != CT_PTR_TYPE && first->type != CT_BYREF)
+      if (  first->type != CT_PTR_TYPE
+         && first->type != CT_BYREF)
       {
          // Add or remove space between return type and function name. A
          // minimum of 1 is forced except for pointer/reference return types.
@@ -2442,8 +2575,9 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_type_func());
    }
 
-   // "(int)a" vs "(int) a" or "cast(int)a" vs "cast(int) a"
-   if (  (get_chunk_parent_type(first) == CT_C_CAST || get_chunk_parent_type(first) == CT_D_CAST)
+   // "(int)a" vs. "(int) a" or "cast(int)a" vs. "cast(int) a"
+   if (  (  get_chunk_parent_type(first) == CT_C_CAST
+         || get_chunk_parent_type(first) == CT_D_CAST)
       && chunk_is_token(first, CT_PAREN_CLOSE))
    {
       log_rule("sp_after_cast");
@@ -2463,6 +2597,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          && chunk_is_token(second, CT_CATCH)
          && (options::sp_oc_brace_catch() != IARF_IGNORE))
       {
+         // TODO: provide some test data to check this block
          // (OC) Add or remove space between '}' and '@catch' if on the same line.
          // If set to ignore, sp_brace_catch is used.
          log_rule("sp_oc_brace_catch");
@@ -2471,6 +2606,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
       if (chunk_is_token(second, CT_CATCH))
       {
+         // TODO: provide some test data to check this block
          // Add or remove space between '}' and 'catch' if on the same line.
          log_rule("sp_brace_catch");
          return(options::sp_brace_catch());
@@ -2493,14 +2629,16 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_inside_braces_enum());
       }
 
-      if (get_chunk_parent_type(first) == CT_STRUCT || get_chunk_parent_type(first) == CT_UNION)
+      if (  get_chunk_parent_type(first) == CT_STRUCT
+         || get_chunk_parent_type(first) == CT_UNION)
       {
          // Fix for issue #1240  adding space in struct initializers
-         chunk_t *tmp = chunk_get_prev_ncnl(first);
+         chunk_t *tmp = chunk_get_prev_ncnnl(first);
 
          if (chunk_is_token(tmp, CT_ASSIGN))
          {
-            log_rule("IGNORE");
+            // TODO: provide some test data to check this block
+            log_rule_short("IGNORE");
             return(IARF_IGNORE);
          }
          // Add or remove space inside struct/union '{' and '}'.
@@ -2517,7 +2655,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
       if (get_chunk_parent_type(first) == CT_BRACED_INIT_LIST)
       {
-         // Add or remove space between nested braces, i.e. '{{' vs '{ {'.
+         // Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+         // only to help the vim command }}}}
          if (  options::sp_brace_brace() != IARF_IGNORE
             && chunk_is_token(second, CT_BRACE_OPEN)
             && get_chunk_parent_type(second) == CT_BRACED_INIT_LIST)
@@ -2561,7 +2700,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_brace_typedef());
    }
 
-   if (chunk_is_token(second, CT_PAREN_OPEN) && get_chunk_parent_type(second) == CT_TEMPLATE)
+   if (  chunk_is_token(second, CT_PAREN_OPEN)
+      && get_chunk_parent_type(second) == CT_TEMPLATE)
    {
       // (D) Add or remove space before the parenthesis in the D constructs
       // 'template Foo(' and 'class Foo('.
@@ -2569,18 +2709,24 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_before_template_paren());
    }
 
-   if (  !chunk_is_token(second, CT_PTR_TYPE)
+   // Issue #3080
+   if (  chunk_is_token(first, CT_PAREN_CLOSE)
+      && get_chunk_parent_type(first) == CT_DECLTYPE
+      && (  chunk_is_token(second, CT_WORD)
+         || chunk_is_token(second, CT_BRACE_OPEN)
+         || chunk_is_token(second, CT_FUNC_CALL)))
+   {
+      iarf_e arg = options::sp_after_decltype();
+      // Add or remove space between 'decltype(...)' and word, brace or function call.
+      log_rule("sp_after_decltype");
+      return(arg);
+   }
+
+   // Issue #3080
+   if (  !language_is_set(LANG_D)
       && chunk_is_token(first, CT_PAREN_CLOSE)
-      && get_chunk_parent_type(first) == CT_DECLTYPE)
+      && chunk_is_token(second, CT_WORD))
    {
-      if (auto arg = iarf_flags_t{ options::sp_after_decltype() })
-      {
-         // Add or remove space between 'decltype(...)' and word.
-         //
-         // Overrides sp_after_type.
-         log_rule("sp_after_decltype");
-         return(arg);
-      }
       // Add or remove space between type and word.
       log_rule("sp_after_type");
       return(options::sp_after_type());
@@ -2589,6 +2735,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (  language_is_set(LANG_VALA)
       && chunk_is_token(second, CT_QUESTION))
    {
+      // TODO: provide some test data to check this block
       // Issue #2090
       // (D) Add or remove space between a type and '?'.
       log_rule("sp_type_question");
@@ -2620,7 +2767,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    if (  !chunk_is_token(second, CT_PTR_TYPE)
-      && (chunk_is_token(first, CT_QUALIFIER) || chunk_is_token(first, CT_TYPE)))
+      && (  chunk_is_token(first, CT_QUALIFIER)
+         || chunk_is_token(first, CT_TYPE)))
    {
       // Add or remove space between type and word. In cases where total removal of
       // whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -2636,24 +2784,11 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(arg);
    }
 
-   if (  chunk_is_token(first, CT_MACRO_OPEN)
-      || chunk_is_token(first, CT_MACRO_CLOSE)
-      || chunk_is_token(first, CT_MACRO_ELSE))
-   {
-      if (chunk_is_token(second, CT_PAREN_OPEN))
-      {
-         // Add or remove space between function name and '(' on function calls.
-         log_rule("sp_func_call_paren");
-         return(options::sp_func_call_paren());
-      }
-      log_rule("IGNORE");
-      return(IARF_IGNORE);
-   }
-
    // If nothing claimed the PTR_TYPE, then return ignore
-   if (chunk_is_token(first, CT_PTR_TYPE) || chunk_is_token(second, CT_PTR_TYPE))
+   if (  chunk_is_token(first, CT_PTR_TYPE)
+      || chunk_is_token(second, CT_PTR_TYPE))
    {
-      log_rule("IGNORE");
+      log_rule_short("IGNORE");
       return(IARF_IGNORE);
    }
 
@@ -2687,14 +2822,16 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_deref());
    }
 
-   if (chunk_is_token(first, CT_POS) || chunk_is_token(first, CT_NEG))
+   if (  chunk_is_token(first, CT_POS)
+      || chunk_is_token(first, CT_NEG))
    {
       // Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
       log_rule("sp_sign");
       return(options::sp_sign());
    }
 
-   if (chunk_is_token(first, CT_INCDEC_BEFORE) || chunk_is_token(second, CT_INCDEC_AFTER))
+   if (  chunk_is_token(first, CT_INCDEC_BEFORE)
+      || chunk_is_token(second, CT_INCDEC_AFTER))
    {
       // Add or remove space between '++' and '--' the word to which it is being
       // applied, as in '(--x)' or 'y++;'.
@@ -2704,13 +2841,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(second, CT_CS_SQ_COLON))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
    if (chunk_is_token(first, CT_CS_SQ_COLON))
    {
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
@@ -2756,7 +2893,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (chunk_is_token(second, CT_OC_COLON))
    {
       if (  first->flags.test(PCF_IN_OC_MSG)
-         && (chunk_is_token(first, CT_OC_MSG_FUNC) || chunk_is_token(first, CT_OC_MSG_NAME)))
+         && (  chunk_is_token(first, CT_OC_MSG_FUNC)
+            || chunk_is_token(first, CT_OC_MSG_NAME)))
       {
          // (OC) Add or remove space before the colon in message specs,
          // i.e. '[object setValue:1];' vs. '[object setValue :1];'.
@@ -2769,19 +2907,21 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_before_oc_colon());
    }
 
-   if (chunk_is_token(second, CT_COMMENT) && get_chunk_parent_type(second) == CT_COMMENT_EMBED)
+   if (  chunk_is_token(second, CT_COMMENT)
+      && get_chunk_parent_type(second) == CT_COMMENT_EMBED)
    {
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
    if (chunk_is_token(first, CT_COMMENT))
    {
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);
    }
 
-   if (chunk_is_token(first, CT_NEW) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_NEW)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
       // c# new Constraint, c++ new operator
       // Add or remove space between 'new' and '(' in 'new()'.
@@ -2791,14 +2931,16 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (  chunk_is_token(first, CT_NEW)
       || chunk_is_token(first, CT_DELETE)
-      || (chunk_is_token(first, CT_TSQUARE) && get_chunk_parent_type(first) == CT_DELETE))
+      || (  chunk_is_token(first, CT_TSQUARE)
+         && get_chunk_parent_type(first) == CT_DELETE))
    {
       // Add or remove space after 'new', 'delete' and 'delete[]'.
       log_rule("sp_after_new");
       return(options::sp_after_new());
    }
 
-   if (chunk_is_token(first, CT_ANNOTATION) && chunk_is_paren_open(second))
+   if (  chunk_is_token(first, CT_ANNOTATION)
+      && chunk_is_paren_open(second))
    {
       // (Java) Add or remove space between an annotation and the open parenthesis.
       log_rule("sp_annotation_paren");
@@ -2812,7 +2954,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_oc_property());
    }
 
-   if (chunk_is_token(first, CT_EXTERN) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_EXTERN)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
       // (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
       log_rule("sp_extern_paren");
@@ -2820,25 +2963,15 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    if (  chunk_is_token(second, CT_TYPE)
-      && (  (chunk_is_token(first, CT_STRING) && get_chunk_parent_type(first) == CT_EXTERN)
-         || (chunk_is_token(first, CT_FPAREN_CLOSE) && get_chunk_parent_type(first) == CT_ATTRIBUTE)))
+      && (  (  chunk_is_token(first, CT_STRING)
+            && get_chunk_parent_type(first) == CT_EXTERN)
+         || (  chunk_is_token(first, CT_FPAREN_CLOSE)
+            && get_chunk_parent_type(first) == CT_ATTRIBUTE)))
    {
-      log_rule("FORCE");
+      log_rule_short("FORCE");
       return(IARF_FORCE);  /* TODO: make this configurable? */
    }
 
-   // this table lists out all combos where a space should NOT be present
-   // CT_UNKNOWN is a wildcard.
-   for (auto it : no_space_table)
-   {
-      if (  (it.first == CT_UNKNOWN || it.first == first->type)
-         && (it.second == CT_UNKNOWN || it.second == second->type))
-      {
-         log_rule("REMOVE from no_space_table");
-         return(IARF_REMOVE);
-      }
-   }
-
    if (chunk_is_token(first, CT_NOEXCEPT))
    {
       // Add or remove space after 'noexcept'.
@@ -2867,7 +3000,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (  chunk_is_token(first, CT_PP_PRAGMA)
       && chunk_is_token(second, CT_PREPROC_BODY))
    {
-      log_rule("REMOVE");
+      log_rule_short("REMOVE");
       return(IARF_REMOVE);
    }
 
@@ -2875,12 +3008,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (  chunk_is_token(first, CT_OPERATOR_VAL)
       && chunk_is_token(second, CT_TYPE))
    {
-      log_rule("IGNORE");
+      log_rule_short("IGNORE");
       return(IARF_IGNORE);
    }
 
    // Issue #995
-   if (chunk_is_token(first, CT_DO) && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  chunk_is_token(first, CT_DO)
+      && chunk_is_token(second, CT_BRACE_OPEN))
    {
       // Add or remove space between 'do' and '{'.
       log_rule("sp_do_brace_open");
@@ -2888,15 +3022,22 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    // Issue #995
-   if (chunk_is_token(first, CT_WHILE_OF_DO) && chunk_is_token(second, CT_PAREN_OPEN))
+   if (  chunk_is_token(first, CT_WHILE_OF_DO)
+      && chunk_is_token(second, CT_PAREN_OPEN))
    {
       // Add or remove space between 'while' and '('.
-      log_rule("sp_while_paren_open");
-      return(options::sp_while_paren_open());
+      if (options::sp_while_paren_open() != IARF_IGNORE)
+      {
+         log_rule("sp_while_paren_open");
+         return(options::sp_while_paren_open());
+      }
+      log_rule("sp_before_sparen");
+      return(options::sp_before_sparen());
    }
 
    // Issue #995
-   if (chunk_is_token(first, CT_BRACE_CLOSE) && chunk_is_token(second, CT_WHILE_OF_DO))
+   if (  chunk_is_token(first, CT_BRACE_CLOSE)
+      && chunk_is_token(second, CT_WHILE_OF_DO))
    {
       // Add or remove space between '}' and 'while.
       log_rule("sp_brace_close_while");
@@ -2905,530 +3046,60 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    // TODO: have a look to Issue #2186, why NEWLINE?
    // Issue #2524
-   if (chunk_is_token(first, CT_NEWLINE) && chunk_is_token(second, CT_BRACE_OPEN))
+   if (  chunk_is_token(first, CT_NEWLINE)
+      && chunk_is_token(second, CT_BRACE_OPEN))
    {
-      log_rule("IGNORE");
+      log_rule_short("IGNORE");
       return(IARF_IGNORE);
    }
 
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_AMP) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ANGLE_CLOSE) && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ANNOTATION) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ASSIGN_FUNC_PROTO) && chunk_is_token(second, CT_DEFAULT))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ASSIGN_FUNC_PROTO) && chunk_is_token(second, CT_DELETE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ASSIGN_FUNC_PROTO) && chunk_is_token(second, CT_NUMBER))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_BIT_COLON) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_BRACE_CLOSE) && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_CLASS_COLON) && chunk_is_token(second, CT_QUALIFIER))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_CLASS_COLON) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_COLON) && chunk_is_token(second, CT_NUMBER))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_COND_COLON) && chunk_is_token(second, CT_FUNC_CALL))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_COND_COLON) && chunk_is_token(second, CT_STRING))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_COND_COLON) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_CONSTR_COLON) && chunk_is_token(second, CT_FUNC_CTOR_VAR))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_CS_PROPERTY) && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ENUM) && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ENUM) && chunk_is_token(second, CT_ENUM_CLASS))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ENUM) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_ENUM_CLASS) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_FPAREN_CLOSE) && chunk_is_token(second, CT_ASSIGN_FUNC_PROTO))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_FPAREN_CLOSE) && chunk_is_token(second, CT_COND_COLON))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_FPAREN_CLOSE) && chunk_is_token(second, CT_CONSTR_COLON))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_FPAREN_CLOSE) && chunk_is_token(second, CT_QUESTION))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_FRIEND) && chunk_is_token(second, CT_CLASS))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_FRIEND) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_LABEL_COLON) && chunk_is_token(second, CT_NEW))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_LABEL_COLON) && chunk_is_token(second, CT_STRING))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_LABEL_COLON) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_NAMESPACE) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_NAMESPACE) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_NUMBER) && chunk_is_token(second, CT_COLON))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_NUMBER) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_NUMBER_FP) && chunk_is_token(second, CT_NUMBER))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_NUMBER_FP) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_OC_CLASS) && chunk_is_token(second, CT_CLASS_COLON))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_OC_CLASS) && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_OC_IMPL) && chunk_is_token(second, CT_OC_CLASS))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_OC_INTF) && chunk_is_token(second, CT_OC_CLASS))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_OC_MSG_DECL) && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PAREN_CLOSE) && chunk_is_token(second, CT_COND_COLON))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-   // if (chunk_is_token(first, CT_PAREN_CLOSE) && chunk_is_token(second, CT_QUESTION))
-   // Issue #2596
-   // look at "sp_cond_question"
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PAREN_CLOSE) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_DEFINE) && chunk_is_token(second, CT_MACRO))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_DEFINE) && chunk_is_token(second, CT_MACRO_FUNC))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_ELSE) && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_IF) && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_IF) && chunk_is_token(second, CT_PP_DEFINE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_IF) && chunk_is_token(second, CT_PP_DEFINED))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_IF) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_IF) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_INCLUDE) && chunk_is_token(second, CT_STRING))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_PP_OTHER) && chunk_is_token(second, CT_PREPROC_BODY))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_QUESTION) && chunk_is_token(second, CT_FUNC_CALL))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_QUESTION) && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_QUESTION) && chunk_is_token(second, CT_STRING))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_QUESTION) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_SPAREN_CLOSE) && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_SQL_EXEC) && chunk_is_token(second, CT_SQL_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_SQL_WORD) && chunk_is_token(second, CT_PAREN_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_STRUCT) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_TSQUARE) && chunk_is_token(second, CT_BRACE_OPEN))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_TSQUARE) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_TYPEDEF) && chunk_is_token(second, CT_ENUM))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_TYPEDEF) && chunk_is_token(second, CT_STRUCT))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_TYPEDEF) && chunk_is_token(second, CT_TYPE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_TYPENAME) && chunk_is_token(second, CT_ELLIPSIS))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_USING) && chunk_is_token(second, CT_NAMESPACE))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_USING) && chunk_is_token(second, CT_WORD))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_WORD) && chunk_is_token(second, CT_BRACE_OPEN))
+   // =============================================================
+   // categorie 1
+   // this table lists out all combos where a space should NOT be present
+   // CT_UNKNOWN is a wildcard.
+   for (auto it : no_space_table)
    {
-      log_rule("ADD");
-      return(IARF_ADD);
+      if (  (  it.first == CT_UNKNOWN
+            || it.first == first->type)
+         && (  it.second == CT_UNKNOWN
+            || it.second == second->type))
+      {
+         log_rule("REMOVE from no_space_table");
+         return(IARF_REMOVE);
+      }
    }
-   // if (chunk_is_token(first, CT_WORD) && chunk_is_token(second, CT_COND_COLON))
-   // Issue #2596
-   // look at "sp_cond_colon"
 
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_WORD) && chunk_is_token(second, CT_NUMBER))
+   // =============================================================
+   // categorie 2
+   // this table lists out all combos where a space MUST be present
+   for (auto it : add_space_table)
    {
-      log_rule("ADD");
-      return(IARF_ADD);
+      if (  it.first == first->type
+         && it.second == second->type)
+      {
+         // TODO: if necessary create a new option
+         log_rule("ADD from add_space_table");
+         return(IARF_ADD);
+      }
    }
 
-   // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_WORD) && chunk_is_token(second, CT_NUMBER_FP))
+   // Issue #2386
+   if (  chunk_is_token(first, CT_FORM_FEED)
+      || chunk_is_token(second, CT_FORM_FEED))
    {
-      log_rule("ADD");
-      return(IARF_ADD);
+      log_rule_short("IGNORE");
+      return(IARF_IGNORE);
    }
 
    // TODO: if necessary create a new option
-   if (chunk_is_token(first, CT_WORD) && chunk_is_token(second, CT_QUESTION))
-   {
-      log_rule("ADD");
-      return(IARF_ADD);
-   }
-
-   // Issue #2386
-   if (  chunk_is_token(first, CT_FORM_FEED)
-      || chunk_is_token(second, CT_FORM_FEED))
+   if (  chunk_is_token(first, CT_MACRO_FUNC_CALL)
+      && chunk_is_token(second, CT_FPAREN_OPEN))
    {
       log_rule("IGNORE");
       return(IARF_IGNORE);
    }
-   //
+   // =============================================================
+   // categorie 3
    // these lines are only useful for debugging uncrustify itself
    LOG_FMT(LSPACE, "\n\n%s(%d): WARNING: unrecognize do_space:\n",
            __func__, __LINE__);
@@ -3436,8 +3107,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
            first->orig_line, first->orig_col, first->text(), get_token_name(first->type));
    LOG_FMT(LSPACE, "   second->orig_line is %zu, second->orig_col is %zu, second->text() '%s', second->type is %s\n",
            second->orig_line, second->orig_col, second->text(), get_token_name(second->type));
+   LOG_FMT(LSPACE, "   Please make a call at https://github.com/uncrustify/uncrustify/issues/new\n");
+   LOG_FMT(LSPACE, "   or merge the line:\n");
+   LOG_FMT(LSPACE, "   {%s,    %s},\n",
+           get_token_name(first->type), get_token_name(second->type));
+   LOG_FMT(LSPACE, "   in the file <Path_to_uncrustify>/src/add_space_table.h\n");
 
-   log_rule("ADD as default value");
+   log_rule_short("ADD as default value");
    return(IARF_ADD);
 } // do_space
 
@@ -3446,8 +3122,8 @@ static iarf_e ensure_force_space(chunk_t *first, chunk_t *second, iarf_e av)
 {
    if (first->flags.test(PCF_FORCE_SPACE))
    {
-      LOG_FMT(LSPACE, " <force between '%s' and '%s'>",
-              first->text(), second->text());
+      LOG_FMT(LSPACE, "%s(%d): <force between '%s' and '%s'>",
+              __func__, __LINE__, first->text(), second->text());
       return(av | IARF_ADD);
    }
    return(av);
@@ -3456,7 +3132,9 @@ static iarf_e ensure_force_space(chunk_t *first, chunk_t *second, iarf_e av)
 
 static iarf_e do_space_ensured(chunk_t *first, chunk_t *second, int &min_sp)
 {
-   return(ensure_force_space(first, second, do_space(first, second, min_sp)));
+   iarf_e aa = ensure_force_space(first, second, do_space(first, second, min_sp));
+
+   return(aa);
 }
 
 
@@ -3483,8 +3161,9 @@ void space_text(void)
       }
       else
       {
+         char copy[1000];
          LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, '%s' type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type));
       }
 
       if (  (options::use_options_overriding_for_qt_macros())
@@ -3507,7 +3186,8 @@ void space_text(void)
 
          while (  chunk_is_blank(next)
                && !chunk_is_newline(next)
-               && (chunk_is_token(next, CT_VBRACE_OPEN) || chunk_is_token(next, CT_VBRACE_CLOSE)))
+               && (  chunk_is_token(next, CT_VBRACE_OPEN)
+                  || chunk_is_token(next, CT_VBRACE_CLOSE)))
          {
             LOG_FMT(LSPACE, "%s(%d): orig_line is %zu, orig_col is %zu, Skip %s (%zu+%zu)\n",
                     __func__, __LINE__, next->orig_line, next->orig_col, get_token_name(next->type),
@@ -3590,12 +3270,14 @@ void space_text(void)
                tmp = chunk_get_next(tmp);
             }
 
-            if (tmp != nullptr && tmp->len() > 0)
+            if (  tmp != nullptr
+               && tmp->len() > 0)
             {
                bool kw1 = CharTable::IsKw2(pc->str[pc->len() - 1]);
                bool kw2 = CharTable::IsKw1(next->str[0]);
 
-               if (kw1 && kw2)
+               if (  kw1
+                  && kw2)
                {
                   // back-to-back words need a space
                   LOG_FMT(LSPACE, "%s(%d): back-to-back words need a space: pc->text() '%s', next->text() '%s'\n",
@@ -3617,7 +3299,8 @@ void space_text(void)
                   const chunk_tag_t *ct;
                   ct = find_punctuator(buf, cpd.lang_flags);
 
-                  if (ct != nullptr && (strlen(ct->tag) != pc->len()))
+                  if (  ct != nullptr
+                     && (strlen(ct->tag) != pc->len()))
                   {
                      // punctuator parsed to a different size..
 
@@ -3665,7 +3348,8 @@ void space_text(void)
          {
             int delta = min_sp;
 
-            if (next->orig_col >= pc->orig_col_end && pc->orig_col_end != 0)
+            if (  next->orig_col >= pc->orig_col_end
+               && pc->orig_col_end != 0)
             {
                // Keep the same relative spacing, minimum 1
                delta = next->orig_col - pc->orig_col_end;
@@ -3686,7 +3370,8 @@ void space_text(void)
          case IARF_IGNORE:
 
             // Keep the same relative spacing, if possible
-            if (next->orig_col >= pc->orig_col_end && pc->orig_col_end != 0)
+            if (  next->orig_col >= pc->orig_col_end
+               && pc->orig_col_end != 0)
             {
                column += next->orig_col - pc->orig_col_end;
             }
@@ -3714,6 +3399,7 @@ void space_text(void)
              * do some comment adjustments if sp_before_tr_emb_cmt and
              * sp_endif_cmt did not apply.
              */
+            // Add or remove space between #else or #endif and a trailing comment.
             if (  (  options::sp_before_tr_emb_cmt() == IARF_IGNORE
                   || (  get_chunk_parent_type(next) != CT_COMMENT_END
                      && get_chunk_parent_type(next) != CT_COMMENT_EMBED))
@@ -3787,7 +3473,8 @@ void space_text_balance_nested_parens(void)
       }
 
       // if there are two successive opening parenthesis
-      if (chunk_is_str(first, "(", 1) && chunk_is_str(next, "(", 1))
+      if (  chunk_is_str(first, "(", 1)
+         && chunk_is_str(next, "(", 1))
       {
          // insert a space between them
          space_add_after(first, 1);
@@ -3800,7 +3487,8 @@ void space_text_balance_nested_parens(void)
             space_add_after(closing->prev, 1);
          }
       }
-      else if (chunk_is_str(first, ")", 1) && chunk_is_str(next, ")", 1))
+      else if (  chunk_is_str(first, ")", 1)
+              && chunk_is_str(next, ")", 1))
       {
          // insert a space between the two closing parens
          space_add_after(first, 1);
@@ -3920,7 +3608,8 @@ void space_add_after(chunk_t *pc, size_t count)
    chunk_t *next = chunk_get_next(pc);
 
    // don't add at the end of the file or before a newline
-   if (next == nullptr || chunk_is_newline(next))
+   if (  next == nullptr
+      || chunk_is_newline(next))
    {
       return;
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/space.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.h
index e856f135..e856f135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/space.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/space.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/symbols_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/symbols_table.h
index 1a864478..1a864478 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/symbols_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/symbols_table.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/token_enum.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/token_enum.h
index 682cc826..81caf0d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/token_enum.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/token_enum.h
@@ -19,7 +19,7 @@
 
 /**
  * This is an enum of all the different chunks/tokens/elements that the
- * program can work with.  The parser and scanner assigns one of these to
+ * program can work with. The parser and scanner assigns one of these to
  * each chunk/token.
  */
 enum c_token_t
@@ -177,7 +177,7 @@ enum c_token_t
    CT_USING,
    CT_USING_STMT,       // using (xxx) ...
    CT_USING_ALIAS,      // using identifier attr(optional) = type-id
-   CT_D_WITH,           // D: paren+braced
+   CT_D_WITH,           // D: parenthetis+braced
    CT_D_MODULE,
    CT_SUPER,
    CT_DELEGATE,
@@ -197,23 +197,26 @@ enum c_token_t
    CT_D_VERSION,        // turns into CT_D_VERSION_IF if not followed by '='
    CT_D_VERSION_IF,     // version(x) { }
 
-   // note for paren/brace/square pairs: close MUST be open + 1
+   // note for parenthetis/brace/square pairs: close MUST be open + 1
    CT_PAREN_OPEN,
    CT_PAREN_CLOSE,
 
    CT_ANGLE_OPEN,       // template<T*>
    CT_ANGLE_CLOSE,
 
-   CT_SPAREN_OPEN,      // 'special' paren after if/for/switch/while/synchronized/catch
+   CT_SPAREN_OPEN,      // 'special' parenthetis after if/for/switch/while/synchronized/catch
    CT_SPAREN_CLOSE,
 
-   CT_PPAREN_OPEN,      // 'protect' paren to protect a type such as (*int)
+   CT_PPAREN_OPEN,      // 'protect' parenthetis to protect a type such as (*int)
    CT_PPAREN_CLOSE,     // used at align_func_param
 
-   CT_FPAREN_OPEN,      // 'function' paren after fcn/macro fcn
+   CT_FPAREN_OPEN,      // 'function' parenthetis after fcn/macro fcn
    CT_FPAREN_CLOSE,
 
-   CT_TPAREN_OPEN,      // 'type' paren used in function types
+   CT_LPAREN_OPEN,      // lambda-declarator parenthetis
+   CT_LPAREN_CLOSE,
+
+   CT_TPAREN_OPEN,      // 'type' parenthetis used in function types
    CT_TPAREN_CLOSE,
 
    CT_BRACE_OPEN,       // {...}
@@ -248,6 +251,7 @@ enum c_token_t
    CT_FUNC_WRAP,          // macro that wraps the function name
    CT_PROTO_WRAP,         // macro: "RETVAL PROTO_WRAP( fcn_name, (PARAMS))". Parens for PARAMS are optional.
    CT_MACRO_FUNC,         // function-like macro
+   CT_MACRO_FUNC_CALL,    // function-like macro call
    CT_MACRO,              // a macro def
    CT_QUALIFIER,          // static, const, etc
    CT_EXTERN,             // extern
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.cpp
index 40a2899d..f0a4e2d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.cpp
@@ -10,25 +10,22 @@
 
 #include "tokenize.h"
 
-#include "char_table.h"
-#include "chunk_list.h"
 #include "keywords.h"
-#include "language_tools.h"
-#include "log_rules.h"
 #include "prototypes.h"
 #include "punctuators.h"
 #include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <stack>
+#include <regex>
+
+#ifdef WIN32
+#include <stack>            // to get std::stack
+#endif // WIN32
 
 
 #define LE_COUNT(x)    cpd.le_counts[static_cast<size_t>(LE_ ## x)]
 
+constexpr static auto LCURRENT = LTOK;
+
 using namespace std;
 using namespace uncrustify;
 
@@ -363,7 +360,8 @@ static bool d_parse_string(tok_ctx &ctx, chunk_t &pc)
 {
    size_t ch = ctx.peek();
 
-   if (ch == '"' || ch == '\'')
+   if (  ch == '"'
+      || ch == '\'')
    {
       return(parse_string(ctx, pc, 0, true));
    }
@@ -373,7 +371,9 @@ static bool d_parse_string(tok_ctx &ctx, chunk_t &pc)
       return(parse_string(ctx, pc, 0, false));
    }
 
-   if ((ch == 'r' || ch == 'x') && ctx.peek(1) == '"')
+   if (  (  ch == 'r'
+         || ch == 'x')
+      && ctx.peek(1) == '"')
    {
       return(parse_string(ctx, pc, 1, false));
    }
@@ -433,12 +433,14 @@ static bool d_parse_string(tok_ctx &ctx, chunk_t &pc)
          pc.str.append(ctx.get());
          ch = ctx.peek();
 
-         if ((ch >= '0') && (ch <= '7'))
+         if (  (ch >= '0')
+            && (ch <= '7'))
          {
             pc.str.append(ctx.get());
             ch = ctx.peek();
 
-            if ((ch >= '0') && (ch <= '7'))
+            if (  (ch >= '0')
+               && (ch <= '7'))
             {
                pc.str.append(ctx.get());
             }
@@ -508,7 +510,8 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
    if (  (ctx.peek() != '/')
       || (  (ctx.peek(1) != '*')
          && (ctx.peek(1) != '/')
-         && ((ctx.peek(1) != '+') || !is_d)))
+         && (  (ctx.peek(1) != '+')
+            || !is_d)))
    {
       return(false);
    }
@@ -532,12 +535,14 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
          {
             ch = ctx.peek();
 
-            if ((ch == '\r') || (ch == '\n'))
+            if (  (ch == '\r')
+               || (ch == '\n'))
             {
                break;
             }
 
-            if ((ch == '\\') && !is_cs) // backslashes aren't special in comments in C#
+            if (  (ch == '\\')
+               && !is_cs) // backslashes aren't special in comments in C#
             {
                bs_cnt++;
             }
@@ -552,7 +557,8 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
           * If we hit an odd number of backslashes right before the newline,
           * then we keep going.
           */
-         if (((bs_cnt & 1) == 0) || !ctx.more())
+         if (  ((bs_cnt & 1) == 0)
+            || !ctx.more())
          {
             break;
          }
@@ -581,9 +587,11 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
       set_chunk_type(&pc, CT_COMMENT);
       d_level++;
 
-      while (d_level > 0 && ctx.more())
+      while (  d_level > 0
+            && ctx.more())
       {
-         if ((ctx.peek() == '+') && (ctx.peek(1) == '/'))
+         if (  (ctx.peek() == '+')
+            && (ctx.peek(1) == '/'))
          {
             pc.str.append(ctx.get());  // store the '+'
             pc.str.append(ctx.get());  // store the '/'
@@ -591,7 +599,8 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
             continue;
          }
 
-         if ((ctx.peek() == '/') && (ctx.peek(1) == '+'))
+         if (  (ctx.peek() == '/')
+            && (ctx.peek(1) == '+'))
          {
             pc.str.append(ctx.get());  // store the '/'
             pc.str.append(ctx.get());  // store the '+'
@@ -601,7 +610,8 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
          ch = ctx.get();
          pc.str.append(ch);
 
-         if ((ch == '\n') || (ch == '\r'))
+         if (  (ch == '\n')
+            || (ch == '\r'))
          {
             set_chunk_type(&pc, CT_COMMENT_MULTI);
             pc.nl_count++;
@@ -631,7 +641,8 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
 
       while (ctx.more())
       {
-         if ((ctx.peek() == '*') && (ctx.peek(1) == '/'))
+         if (  (ctx.peek() == '*')
+            && (ctx.peek(1) == '/'))
          {
             pc.str.append(ctx.get());  // store the '*'
             pc.str.append(ctx.get());  // store the '/'
@@ -641,12 +652,14 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
             size_t   oldsize = pc.str.size();
 
             // If there is another C comment right after this one, combine them
-            while ((ctx.peek() == ' ') || (ctx.peek() == '\t'))
+            while (  (ctx.peek() == ' ')
+                  || (ctx.peek() == '\t'))
             {
                pc.str.append(ctx.get());
             }
 
-            if ((ctx.peek() != '/') || (ctx.peek(1) != '*'))
+            if (  (ctx.peek() != '/')
+               || (ctx.peek(1) != '*'))
             {
                // undo the attempt to join
                ctx.restore(ss);
@@ -657,7 +670,8 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
          ch = ctx.get();
          pc.str.append(ch);
 
-         if ((ch == '\n') || (ch == '\r'))
+         if (  (ch == '\n')
+            || (ch == '\r'))
          {
             set_chunk_type(&pc, CT_COMMENT_MULTI);
             pc.nl_count++;
@@ -684,11 +698,12 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
 
    if (cpd.unc_off)
    {
-      log_rule_B("enable_processing_cmt");
-      const auto &ontext = options::enable_processing_cmt();
+      bool found_enable_marker = (find_enable_processing_comment_marker(pc.str) >= 0);
 
-      if (!ontext.empty() && pc.str.find(ontext.c_str()) >= 0)
+      if (found_enable_marker)
       {
+         const auto &ontext = options::enable_processing_cmt();
+
          LOG_FMT(LBCTRL, "%s(%d): Found '%s' on line %zu\n",
                  __func__, __LINE__, ontext.c_str(), pc.orig_line);
          cpd.unc_off = false;
@@ -696,16 +711,28 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
    }
    else
    {
-      log_rule_B("disable_processing_cmt");
-      const auto &offtext = options::disable_processing_cmt();
+      auto position_disable_processing_cmt = find_disable_processing_comment_marker(pc.str);
+      bool found_disable_marker            = (position_disable_processing_cmt >= 0);
 
-      if (!offtext.empty() && pc.str.find(offtext.c_str()) >= 0)
+      if (found_disable_marker)
       {
-         LOG_FMT(LBCTRL, "%s(%d): Found '%s' on line %zu\n",
-                 __func__, __LINE__, offtext.c_str(), pc.orig_line);
-         cpd.unc_off = true;
-         // Issue #842
-         cpd.unc_off_used = true;
+         /**
+          * the user may wish to disable processing part of a multiline comment,
+          * in which case we'll handle at a late time. Check to see if processing
+          * is re-enabled elsewhere in this comment
+          */
+         auto position_enable_processing_cmt = find_enable_processing_comment_marker(pc.str);
+
+         if (position_enable_processing_cmt < position_disable_processing_cmt)
+         {
+            const auto &offtext = options::disable_processing_cmt();
+
+            LOG_FMT(LBCTRL, "%s(%d): Found '%s' on line %zu\n",
+                    __func__, __LINE__, offtext.c_str(), pc.orig_line);
+            cpd.unc_off = true;
+            // Issue #842
+            cpd.unc_off_used = true;
+         }
       }
    }
    return(true);
@@ -714,7 +741,8 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
 
 static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc)
 {
-   if ((ctx.peek() != '<') || (ctx.peek(1) != '#'))
+   if (  (ctx.peek() != '<')
+      || (ctx.peek(1) != '#'))
    {
       return(false);
    }
@@ -733,7 +761,8 @@ static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc)
       last1 = ctx.get();
       pc.str.append(last1);
 
-      if ((last2 == '#') && (last1 == '>'))
+      if (  (last2 == '#')
+         && (last1 == '>'))
       {
          set_chunk_type(&pc, CT_WORD);
          return(true);
@@ -757,15 +786,18 @@ static void parse_suffix(tok_ctx &ctx, chunk_t &pc, bool forstring = false)
 
       if (  forstring
          && (  (  (p1 == 'L')
-               && ((p2 == '"') || (p2 == '\'')))
-            || ((p1 == 'S') && (p2 == '"'))))
+               && (  (p2 == '"')
+                  || (p2 == '\'')))
+            || (  (p1 == 'S')
+               && (p2 == '"'))))
       {
          return;
       }
       tok_info ss;
       ctx.save(ss);
 
-      while (ctx.more() && CharTable::IsKw2(ctx.peek()))
+      while (  ctx.more()
+            && CharTable::IsKw2(ctx.peek()))
       {
          slen++;
          pc.str.append(ctx.get());
@@ -785,7 +817,8 @@ static void parse_suffix(tok_ctx &ctx, chunk_t &pc, bool forstring = false)
 
 static bool is_bin(int ch)
 {
-   return((ch == '0') || (ch == '1'));
+   return(  (ch == '0')
+         || (ch == '1'));
 }
 
 
@@ -799,7 +832,8 @@ static bool is_bin_(int ch)
 
 static bool is_oct(int ch)
 {
-   return((ch >= '0') && (ch <= '7'));
+   return(  (ch >= '0')
+         && (ch <= '7'));
 }
 
 
@@ -813,7 +847,8 @@ static bool is_oct_(int ch)
 
 static bool is_dec(int ch)
 {
-   return((ch >= '0') && (ch <= '9'));
+   return(  (ch >= '0')
+         && (ch <= '9'));
 }
 
 
@@ -828,9 +863,12 @@ static bool is_dec_(int ch)
 
 static bool is_hex(int ch)
 {
-   return(  ((ch >= '0') && (ch <= '9'))
-         || ((ch >= 'a') && (ch <= 'f'))
-         || ((ch >= 'A') && (ch <= 'F')));
+   return(  (  (ch >= '0')
+            && (ch <= '9'))
+         || (  (ch >= 'a')
+            && (ch <= 'f'))
+         || (  (ch >= 'A')
+            && (ch <= 'F')));
 }
 
 
@@ -849,13 +887,15 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
     * (signs handled elsewhere)
     */
    if (  !is_dec(ctx.peek())
-      && ((ctx.peek() != '.') || !is_dec(ctx.peek(1))))
+      && (  (ctx.peek() != '.')
+         || !is_dec(ctx.peek(1))))
    {
       return(false);
    }
    bool is_float = (ctx.peek() == '.');
 
-   if (is_float && (ctx.peek(1) == '.')) // make sure it isn't '..'
+   if (  is_float
+      && (ctx.peek(1) == '.')) // make sure it isn't '..'
    {
       return(false);
    }
@@ -867,7 +907,8 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
     */
    bool did_hex = false;
 
-   if (ctx.peek() == '0' && !language_is_set(LANG_CS))
+   if (  ctx.peek() == '0'
+      && !language_is_set(LANG_CS))
    {
       size_t  ch;
       chunk_t pc_temp;
@@ -878,7 +919,8 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
       // MS constant might have an "h" at the end. Look for it
       ctx.save();
 
-      while (ctx.more() && CharTable::IsKw2(ctx.peek()))
+      while (  ctx.more()
+            && CharTable::IsKw2(ctx.peek()))
       {
          ch = ctx.get();
          pc_temp.str.append(ch);
@@ -958,13 +1000,15 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
    }
 
    // Check if we stopped on a decimal point & make sure it isn't '..'
-   if ((ctx.peek() == '.') && (ctx.peek(1) != '.'))
+   if (  (ctx.peek() == '.')
+      && (ctx.peek(1) != '.'))
    {
       // Issue #1265, 5.clamp()
       tok_info ss;
       ctx.save(ss);
 
-      while (ctx.more() && CharTable::IsKw2(ctx.peek(1)))
+      while (  ctx.more()
+            && CharTable::IsKw2(ctx.peek(1)))
       {
          // skip characters to check for paren open
          ctx.get();
@@ -1006,12 +1050,14 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
     */
    size_t tmp = unc_toupper(ctx.peek());
 
-   if ((tmp == 'E') || (tmp == 'P'))
+   if (  (tmp == 'E')
+      || (tmp == 'P'))
    {
       is_float = true;
       pc.str.append(ctx.get());
 
-      if ((ctx.peek() == '+') || (ctx.peek() == '-'))
+      if (  (ctx.peek() == '+')
+         || (ctx.peek() == '-'))
       {
          pc.str.append(ctx.get());
       }
@@ -1045,7 +1091,8 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
       {
          is_float = true;
       }
-      else if ((tmp2 != 'L') && (tmp2 != 'U'))
+      else if (  (tmp2 != 'L')
+              && (tmp2 != 'U'))
       {
          break;
       }
@@ -1053,8 +1100,10 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
    }
 
    // skip the Microsoft-specific '32' and '64' suffix
-   if (  ((ctx.peek() == '3') && (ctx.peek(1) == '2'))
-      || ((ctx.peek() == '6') && (ctx.peek(1) == '4')))
+   if (  (  (ctx.peek() == '3')
+         && (ctx.peek(1) == '2'))
+      || (  (ctx.peek() == '6')
+         && (ctx.peek(1) == '4')))
    {
       pc.str.append(ctx.get());
       pc.str.append(ctx.get());
@@ -1102,7 +1151,8 @@ static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow
       const size_t ch = ctx.get();
 
       // convert char 9 (\t) to chars \t
-      if ((ch == '\t') && should_escape_tabs)
+      if (  (ch == '\t')
+         && should_escape_tabs)
       {
          const size_t lastcol = ctx.c.col - 1;
          ctx.c.col = lastcol + 2;
@@ -1117,7 +1167,8 @@ static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow
          pc.nl_count++;
          set_chunk_type(&pc, CT_STRING_MULTI);
       }
-      else if (ch == '\r' && ctx.peek() != '\n')
+      else if (  ch == '\r'
+              && ctx.peek() != '\n')
       {
          pc.str.append(ctx.get());
          pc.nl_count++;
@@ -1140,7 +1191,8 @@ static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow
             continue;
          }
 
-         if (ch == escape_char2 && (ctx.peek() == termination_character))
+         if (  ch == escape_char2
+            && (ctx.peek() == termination_character))
          {
             escaped = allow_escape;
             continue;
@@ -1290,7 +1342,8 @@ static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc)
       {
          // do nothing. if we're in a brace, we only want the newline handling, and skip the rest.
       }
-      else if ((ch == '\t') && should_escape_tabs)
+      else if (  (ch == '\t')
+              && should_escape_tabs)
       {
          if (parseState.top().type & CS_STRING_VERBATIM)
          {
@@ -1325,17 +1378,20 @@ static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc)
             continue;
          }
       }
-      else if (ch == '\\' && !(parseState.top().type & CS_STRING_VERBATIM))
+      else if (  ch == '\\'
+              && !(parseState.top().type & CS_STRING_VERBATIM))
       {
          // catch escaped quote in order to avoid ending string (but also must handle \\ to avoid accidental 'escape' seq of `\\"`)
-         if (ctx.peek() == '"' || ctx.peek() == '\\')
+         if (  ctx.peek() == '"'
+            || ctx.peek() == '\\')
          {
             pc.str.append(ctx.get());
          }
       }
       else if (ch == '"')
       {
-         if ((parseState.top().type & CS_STRING_VERBATIM) && (ctx.peek() == '"'))
+         if (  (parseState.top().type & CS_STRING_VERBATIM)
+            && (ctx.peek() == '"'))
          {
             // in verbatim string, `""` is escape'd `"`
             pc.str.append(ctx.get());
@@ -1394,7 +1450,8 @@ static void parse_verbatim_string(tok_ctx &ctx, chunk_t &pc)
          break;
       }
 
-      if ((ch == '\n') || (ch == '\r'))
+      if (  (ch == '\n')
+         || (ch == '\r'))
       {
          set_chunk_type(&pc, CT_STRING_MULTI);
          pc.nl_count++;
@@ -1436,7 +1493,8 @@ static bool parse_cr_string(tok_ctx &ctx, chunk_t &pc, size_t q_idx)
    }
 
    // Add the tag and get the length of the tag
-   while (ctx.more() && (ctx.peek() != '('))
+   while (  ctx.more()
+         && (ctx.peek() != '('))
    {
       tag_len++;
       pc.str.append(ctx.get());
@@ -1504,7 +1562,8 @@ static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
       {
          pc.str.append(ctx.get());
       }
-      else if ((ch == '\\') && (unc_tolower(ctx.peek(1)) == 'u'))
+      else if (  (ch == '\\')
+              && (unc_tolower(ctx.peek(1)) == 'u'))
       {
          pc.str.append(ctx.get());
          pc.str.append(ctx.get());
@@ -1529,7 +1588,8 @@ static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
    }
 
    // Detect pre-processor functions now
-   if (cpd.in_preproc == CT_PP_DEFINE && cpd.preproc_ncnl_count == 1)
+   if (  cpd.in_preproc == CT_PP_DEFINE
+      && cpd.preproc_ncnl_count == 1)
    {
       if (ctx.peek() == '(')
       {
@@ -1571,7 +1631,8 @@ static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
           * end up with a function named 'define' as PP_IGNORE. This is necessary because with
           * the config 'set' feature, there's no way to do a pair of tokens as a word
           * substitution. */
-         if (pc.type == CT_PP_IGNORE && !cpd.in_preproc)
+         if (  pc.type == CT_PP_IGNORE
+            && !cpd.in_preproc)
          {
             set_chunk_type(&pc, find_keyword_type(pc.text(), pc.str.size()));
          }
@@ -1589,12 +1650,14 @@ static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
                {
                   ch = ctx.peek();
 
-                  if ((ch == '\r') || (ch == '\n'))
+                  if (  (ch == '\r')
+                     || (ch == '\n'))
                   {
                      break;
                   }
 
-                  if ((ch == '\\') && !is_cs) // backslashes aren't special in comments in C#
+                  if (  (ch == '\\')
+                     && !is_cs) // backslashes aren't special in comments in C#
                   {
                      bs_cnt++;
                   }
@@ -1609,7 +1672,8 @@ static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
                 * If we hit an odd number of backslashes right before the newline,
                 * then we keep going.
                 */
-               if (((bs_cnt & 1) == 0) || !ctx.more())
+               if (  ((bs_cnt & 1) == 0)
+                  || !ctx.more())
                {
                   break;
                }
@@ -1646,12 +1710,16 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
    {
       auto ch2 = ctx.peek(offset++);
 
-      while (ch2 == ' ' || ch2 == '\n' || ch2 == '\r' || ch2 == '\t')
+      while (  ch2 == ' '
+            || ch2 == '\n'
+            || ch2 == '\r'
+            || ch2 == '\t')
       {
          ch2 = ctx.peek(offset++);
       }
 
-      if (nested == 0 && ch2 != '[')
+      if (  nested == 0
+         && ch2 != '[')
       {
          break;
       }
@@ -1674,7 +1742,8 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
          continue;
       }
 
-      if (ch1 != '[' && ch1 != ']')
+      if (  ch1 != '['
+         && ch1 != ']')
       {
          ch1 = ch2;
          continue;
@@ -1692,7 +1761,8 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
 
       if (ch1 == '[')
       {
-         if (nested != 0 && parens == 0)
+         if (  nested != 0
+            && parens == 0)
          {
             break;
          }
@@ -1727,7 +1797,8 @@ static bool parse_whitespace(tok_ctx &ctx, chunk_t &pc)
    size_t ch       = 0;
 
    // REVISIT: use a better whitespace detector?
-   while (ctx.more() && unc_isspace(ctx.peek()))
+   while (  ctx.more()
+         && unc_isspace(ctx.peek()))
    {
       ch = ctx.get();   // throw away the whitespace char
 
@@ -1789,11 +1860,13 @@ static bool parse_bs_newline(tok_ctx &ctx, chunk_t &pc)
 
    size_t ch;
 
-   while (ctx.more() && unc_isspace(ch = ctx.peek()))
+   while (  ctx.more()
+         && unc_isspace(ch = ctx.peek()))
    {
       ctx.get();
 
-      if ((ch == '\r') || (ch == '\n'))
+      if (  (ch == '\r')
+         || (ch == '\n'))
       {
          if (ch == '\r')
          {
@@ -1815,12 +1888,14 @@ static bool parse_newline(tok_ctx &ctx)
    ctx.save();
 
    // Eat whitespace
-   while ((ctx.peek() == ' ') || (ctx.peek() == '\t'))
+   while (  (ctx.peek() == ' ')
+         || (ctx.peek() == '\t'))
    {
       ctx.get();
    }
 
-   if ((ctx.peek() == '\r') || (ctx.peek() == '\n'))
+   if (  (ctx.peek() == '\r')
+      || (ctx.peek() == '\n'))
    {
       if (!ctx.expect('\n'))
       {
@@ -1846,7 +1921,8 @@ static void parse_pawn_pattern(tok_ctx &ctx, chunk_t &pc, c_token_t tt)
       {
          size_t ch = ctx.peek(1);
 
-         if ((ch == '\n') || (ch == '\r'))
+         if (  (ch == '\n')
+            || (ch == '\r'))
          {
             break;
          }
@@ -1890,15 +1966,22 @@ static bool parse_macro(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
    ctx.save();
    pc.str.clear();
 
-   bool continued = chunk_is_token(prev_pc, CT_NL_CONT) || chunk_is_token(prev_pc, CT_COMMENT_MULTI);
+   bool continued = (  chunk_is_token(prev_pc, CT_NL_CONT)
+                    || chunk_is_token(prev_pc, CT_COMMENT_MULTI));
 
    while (ctx.more())
    {
       size_t pk = ctx.peek(), pk1 = ctx.peek(1);
-      bool   nl      = (pk == '\n' || pk == '\r');
-      bool   nl_cont = (pk == '\\' && (pk1 == '\n' || pk1 == '\r'));
+      bool   nl = (  pk == '\n'
+                  || pk == '\r');
+      bool   nl_cont = (  pk == '\\'
+                       && (  pk1 == '\n'
+                          || pk1 == '\r'));
 
-      if ((nl_cont || (continued && nl)) && pc.str.size() > 0)
+      if (  (  nl_cont
+            || (  continued
+               && nl))
+         && pc.str.size() > 0)
       {
          set_chunk_type(&pc, CT_IGNORED);
          return(true);
@@ -1912,7 +1995,7 @@ static bool parse_macro(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
    pc.str.clear();
    ctx.restore();
    return(false);
-}
+} // parse_macro
 
 
 static bool parse_ignored(tok_ctx &ctx, chunk_t &pc)
@@ -1939,8 +2022,10 @@ static bool parse_ignored(tok_ctx &ctx, chunk_t &pc)
    }
 
    // HACK: turn on if we find '#endasm' or '#pragma' and 'endasm' separated by blanks
-   if (  (  ((pc.str.find("#pragma ") >= 0) || (pc.str.find("#pragma	") >= 0))
-         && ((pc.str.find(" endasm") >= 0) || (pc.str.find("	endasm") >= 0)))
+   if (  (  (  (pc.str.find("#pragma ") >= 0)
+            || (pc.str.find("#pragma	") >= 0))
+         && (  (pc.str.find(" endasm") >= 0)
+            || (pc.str.find("	endasm") >= 0)))
       || (pc.str.find("#endasm") >= 0))
    {
       cpd.unc_off = false;
@@ -1952,10 +2037,32 @@ static bool parse_ignored(tok_ctx &ctx, chunk_t &pc)
    log_rule_B("enable_processing_cmt");
    const auto &ontext = options::enable_processing_cmt();
 
-   if (!ontext.empty() && pc.str.find(ontext.c_str()) < 0)
+   if (!ontext.empty())
    {
-      set_chunk_type(&pc, CT_IGNORED);
-      return(true);
+      bool found_enable_pattern = false;
+
+      if (  ontext != UNCRUSTIFY_ON_TEXT
+         && options::processing_cmt_as_regex())
+      {
+         std::wstring pc_wstring(pc.str.get().cbegin(),
+                                 pc.str.get().cend());
+         std::wregex  criteria(std::wstring(ontext.cbegin(),
+                                            ontext.cend()));
+
+         found_enable_pattern = std::regex_search(pc_wstring.cbegin(),
+                                                  pc_wstring.cend(),
+                                                  criteria);
+      }
+      else
+      {
+         found_enable_pattern = (pc.str.find(ontext.c_str()) >= 0);
+      }
+
+      if (!found_enable_pattern)
+      {
+         set_chunk_type(&pc, CT_IGNORED);
+         return(true);
+      }
    }
    ctx.restore();
 
@@ -1967,7 +2074,8 @@ static bool parse_ignored(tok_ctx &ctx, chunk_t &pc)
    }
 
    // Look for the ending comment and let it pass
-   if (parse_comment(ctx, pc) && !cpd.unc_off)
+   if (  parse_comment(ctx, pc)
+      && !cpd.unc_off)
    {
       return(true);
    }
@@ -2030,7 +2138,8 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
    }
 
    // Handle unknown/unhandled preprocessors
-   if (cpd.in_preproc > CT_PP_BODYCHUNK && cpd.in_preproc <= CT_PP_OTHER)
+   if (  cpd.in_preproc > CT_PP_BODYCHUNK
+      && cpd.in_preproc <= CT_PP_OTHER)
    {
       pc.str.clear();
       tok_info ss;
@@ -2045,13 +2154,15 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
 
          // Fix for issue #1752
          // Ignoring extra spaces after ' \ ' for preproc body continuations
-         if (last == '\\' && ch == ' ')
+         if (  last == '\\'
+            && ch == ' ')
          {
             ctx.get();
             continue;
          }
 
-         if ((ch == '\n') || (ch == '\r'))
+         if (  (ch == '\n')
+            || (ch == '\r'))
          {
             // Back off if this is an escaped newline
             if (last == '\\')
@@ -2082,7 +2193,8 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
    }
 
    // Detect backslash-newline
-   if ((ctx.peek() == '\\') && parse_bs_newline(ctx, pc))
+   if (  (ctx.peek() == '\\')
+      && parse_bs_newline(ctx, pc))
    {
       return(true);
    }
@@ -2107,7 +2219,8 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
       }
 
       // check for non-keyword identifiers such as @if @switch, etc
-      if ((ctx.peek() == '@') && CharTable::IsKw1(ctx.peek(1)))
+      if (  (ctx.peek() == '@')
+         && CharTable::IsKw1(ctx.peek(1)))
       {
          parse_word(ctx, pc, true);
          return(true);
@@ -2138,11 +2251,13 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
       auto idx     = size_t{};
       auto is_real = false;
 
-      if (ch == 'u' && ctx.peek(1) == '8')
+      if (  ch == 'u'
+         && ctx.peek(1) == '8')
       {
          idx = 2;
       }
-      else if (unc_tolower(ch) == 'u' || ch == 'L')
+      else if (  unc_tolower(ch) == 'u'
+              || ch == 'L')
       {
          idx++;
       }
@@ -2157,12 +2272,14 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
 
       if (is_real)
       {
-         if (quote == '"' && parse_cr_string(ctx, pc, idx))
+         if (  quote == '"'
+            && parse_cr_string(ctx, pc, idx))
          {
             return(true);
          }
       }
-      else if (  (quote == '"' || quote == '\'')
+      else if (  (  quote == '"'
+                 || quote == '\'')
               && parse_string(ctx, pc, idx, true))
       {
          return(true);
@@ -2173,14 +2290,16 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
    if (language_is_set(LANG_PAWN))
    {
       if (  cpd.preproc_ncnl_count == 1
-         && (cpd.in_preproc == CT_PP_DEFINE || cpd.in_preproc == CT_PP_EMIT))
+         && (  cpd.in_preproc == CT_PP_DEFINE
+            || cpd.in_preproc == CT_PP_EMIT))
       {
          parse_pawn_pattern(ctx, pc, CT_MACRO);
          return(true);
       }
 
       // Check for PAWN strings: \"hi" or !"hi" or !\"hi" or \!"hi"
-      if ((ctx.peek() == '\\') || (ctx.peek() == '!'))
+      if (  (ctx.peek() == '\\')
+         || (ctx.peek() == '!'))
       {
          if (ctx.peek(1) == '"')
          {
@@ -2188,7 +2307,8 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
             return(true);
          }
 
-         if (  ((ctx.peek(1) == '\\') || (ctx.peek(1) == '!'))
+         if (  (  (ctx.peek(1) == '\\')
+               || (ctx.peek(1) == '!'))
             && (ctx.peek(2) == '"'))
          {
             parse_string(ctx, pc, 2, false);
@@ -2233,18 +2353,22 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
       ch = ctx.peek();
       size_t ch1 = ctx.peek(1);
 
-      if (  (  ((ch == 'L') || (ch == 'S'))
-            && ((ch1 == '"') || (ch1 == '\'')))
+      if (  (  (  (ch == 'L')
+               || (ch == 'S'))
+            && (  (ch1 == '"')
+               || (ch1 == '\'')))
          || (ch == '"')
          || (ch == '\'')
-         || ((ch == '<') && cpd.in_preproc == CT_PP_INCLUDE))
+         || (  (ch == '<')
+            && cpd.in_preproc == CT_PP_INCLUDE))
       {
          parse_string(ctx, pc, unc_isalpha(ch) ? 1 : 0, true);
          set_chunk_parent(&pc, CT_PP_INCLUDE);
          return(true);
       }
 
-      if ((ch == '<') && cpd.in_preproc == CT_PP_DEFINE)
+      if (  (ch == '<')
+         && cpd.in_preproc == CT_PP_DEFINE)
       {
          if (chunk_is_token(chunk_get_tail(), CT_MACRO))
          {
@@ -2266,7 +2390,8 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
    }
 
    // Check for Objective C literals and VALA identifiers ('@1', '@if')
-   if (language_is_set(LANG_OC | LANG_VALA) && (ctx.peek() == '@'))
+   if (  language_is_set(LANG_OC | LANG_VALA)
+      && (ctx.peek() == '@'))
    {
       size_t nc = ctx.peek(1);
 
@@ -2274,20 +2399,26 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
       {
          if (ctx.peek(2) == '"')
          {
+            if (parse_cr_string(ctx, pc, 2)) // Issue #3027
+            {
+               return(true);
+            }
             // parse string without escaping
             parse_string(ctx, pc, 2, false);
             return(true);
          }
       }
 
-      if ((nc == '"') || (nc == '\''))
+      if (  (nc == '"')
+         || (nc == '\''))
       {
          // literal string
          parse_string(ctx, pc, 1, true);
          return(true);
       }
 
-      if ((nc >= '0') && (nc <= '9'))
+      if (  (nc >= '0')
+         && (nc <= '9'))
       {
          // literal number
          pc.str.append(ctx.get());  // store the '@'
@@ -2298,17 +2429,21 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
 
    // Check for pawn/ObjectiveC/Java and normal identifiers
    if (  CharTable::IsKw1(ctx.peek())
-      || ((ctx.peek() == '\\') && (unc_tolower(ctx.peek(1)) == 'u'))
-      || ((ctx.peek() == '@') && CharTable::IsKw1(ctx.peek(1))))
+      || (  (ctx.peek() == '\\')
+         && (unc_tolower(ctx.peek(1)) == 'u'))
+      || (  (ctx.peek() == '@')
+         && CharTable::IsKw1(ctx.peek(1))))
    {
       parse_word(ctx, pc, false);
       return(true);
    }
 
    // Check for C++11/14/17/20 attribute specifier sequences
-   if (language_is_set(LANG_CPP) && ctx.peek() == '[')
+   if (  language_is_set(LANG_CPP)
+      && ctx.peek() == '[')
    {
-      if (!language_is_set(LANG_OC) || !chunk_is_token(prev_pc, CT_OC_AT))
+      if (  !language_is_set(LANG_OC)
+         || !chunk_is_token(prev_pc, CT_OC_AT))
       {
          if (auto length = parse_attribute_specifier_sequence(ctx))
          {
@@ -2379,6 +2514,115 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
 } // parse_next
 
 
+int find_disable_processing_comment_marker(const unc_text &text,
+                                           std::size_t    start_idx)
+{
+   log_rule_B("disable_processing_cmt");
+   const auto &offtext = options::disable_processing_cmt();
+   int        idx      = -1;
+
+   if (  !offtext.empty()
+      && start_idx < text.size())
+   {
+      if (  offtext != UNCRUSTIFY_OFF_TEXT
+         && options::processing_cmt_as_regex())
+      {
+         std::wsmatch match;
+         std::wstring pc_wstring(text.get().cbegin() + start_idx,
+                                 text.get().cend());
+         std::wregex  criteria(std::wstring(offtext.cbegin(),
+                                            offtext.cend()));
+
+         std::regex_search(pc_wstring.cbegin(),
+                           pc_wstring.cend(),
+                           match,
+                           criteria);
+
+         if (!match.empty())
+         {
+            idx = int(match.position() + start_idx);
+         }
+      }
+      else
+      {
+         idx = text.find(offtext.c_str(),
+                         start_idx);
+
+         if (idx >= 0)
+         {
+            idx += int(offtext.size());
+         }
+      }
+
+      /**
+       *  update the position to the start of the current line
+       */
+      while (  idx > 0
+            && text[idx - 1] != '\n')
+      {
+         --idx;
+      }
+   }
+   return(idx);
+} // find_disable_processing_comment_marker
+
+
+int find_enable_processing_comment_marker(const unc_text &text,
+                                          std::size_t    start_idx)
+{
+   log_rule_B("enable_processing_cmt");
+   const auto &ontext = options::enable_processing_cmt();
+   int        idx     = -1;
+
+   if (  !ontext.empty()
+      && start_idx < text.size())
+   {
+      if (  ontext != UNCRUSTIFY_ON_TEXT
+         && options::processing_cmt_as_regex())
+      {
+         std::wsmatch match;
+         std::wstring pc_wstring(text.get().cbegin() + start_idx,
+                                 text.get().cend());
+         std::wregex  criteria(std::wstring(ontext.cbegin(),
+                                            ontext.cend()));
+
+         std::regex_search(pc_wstring.cbegin(),
+                           pc_wstring.cend(),
+                           match,
+                           criteria);
+
+         if (!match.empty())
+         {
+            idx = int(start_idx + match.position() + match.size());
+         }
+      }
+      else
+      {
+         idx = text.find(ontext.c_str(),
+                         start_idx);
+
+         if (idx >= 0)
+         {
+            idx += int(ontext.size());
+         }
+      }
+
+      /**
+       * update the position to the end of the current line
+       */
+      if (idx >= 0)
+      {
+         while (  idx < int(text.size())
+               && text[idx] != '\n')
+         {
+            ++idx;
+         }
+      }
+   }
+   return(idx);
+} // find_enable_processing_comment_marker
+
+
 void tokenize(const deque<int> &data, chunk_t *ref)
 {
    tok_ctx ctx(data);
@@ -2394,6 +2638,7 @@ void tokenize(const deque<int> &data, chunk_t *ref)
    while (ctx.more())
    {
       chunk.reset();
+      chunk.pp_level = 0;
 
       if (!parse_next(ctx, chunk, pc))
       {
@@ -2450,7 +2695,8 @@ void tokenize(const deque<int> &data, chunk_t *ref)
          {
             // If comment contains backslash '\' followed by whitespace chars, keep last one;
             // this will prevent it from turning '\' into line continuation.
-            if ((chunk.str.size() > 1) && (chunk.str[chunk.str.size() - 2] == '\\'))
+            if (  (chunk.str.size() > 1)
+               && (chunk.str[chunk.str.size() - 2] == '\\'))
             {
                break;
             }
@@ -2464,7 +2710,8 @@ void tokenize(const deque<int> &data, chunk_t *ref)
       if (  (  chunk.type == CT_COMMENT_MULTI                  // Issue #1966
             || chunk.type == CT_COMMENT
             || chunk.type == CT_COMMENT_CPP)
-         && (pc != nullptr) && chunk_is_token(pc, CT_PP_IGNORE))
+         && (pc != nullptr)
+         && chunk_is_token(pc, CT_PP_IGNORE))
       {
          chunk.orig_col_end -= num_stripped;
       }
@@ -2512,7 +2759,8 @@ void tokenize(const deque<int> &data, chunk_t *ref)
          chunk_flags_set(pc, PCF_IN_PREPROC);
 
          // Count words after the preprocessor
-         if (!chunk_is_comment(pc) && !chunk_is_newline(pc))
+         if (  !chunk_is_comment(pc)
+            && !chunk_is_newline(pc))
          {
             cpd.preproc_ncnl_count++;
          }
@@ -2530,7 +2778,8 @@ void tokenize(const deque<int> &data, chunk_t *ref)
          // Figure out the type of preprocessor for #include parsing
          if (cpd.in_preproc == CT_PREPROC)
          {
-            if (pc->type < CT_PP_DEFINE || pc->type > CT_PP_OTHER)
+            if (  pc->type < CT_PP_DEFINE
+               || pc->type > CT_PP_OTHER)
             {
                set_chunk_type(pc, CT_PP_OTHER);
             }
@@ -2561,7 +2810,8 @@ void tokenize(const deque<int> &data, chunk_t *ref)
       {
          // Check for a preprocessor start
          if (  chunk_is_token(pc, CT_POUND)
-            && (rprev == nullptr || chunk_is_token(rprev, CT_NEWLINE)))
+            && (  rprev == nullptr
+               || chunk_is_token(rprev, CT_NEWLINE)))
          {
             set_chunk_type(pc, CT_PREPROC);
             chunk_flags_set(pc, PCF_IN_PREPROC);
@@ -2581,8 +2831,9 @@ void tokenize(const deque<int> &data, chunk_t *ref)
       }
       else
       {
+         char copy[1000];
          LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s, orig_col_end is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type), pc->orig_col_end);
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy), get_token_name(pc->type), pc->orig_col_end);
       }
    }
    // Set the cpd.newline string for this file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.h
new file mode 100644
index 00000000..896dd511
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize.h
@@ -0,0 +1,55 @@
+/**
+ * @file tokenize.h
+ * prototypes for tokenize.c
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#ifndef TOKENIZE_H_INCLUDED
+#define TOKENIZE_H_INCLUDED
+
+#include "uncrustify_types.h"
+
+
+/**
+ * Test the input string to see if it satisfies the criteria
+ * specified by the disable_processing_cmt option
+ * @param  text      the string to which a match will be attempted
+ * @param  start_idx the starting index within the string from which the
+ *                   search will be performed
+ * @return           returns a non-negative position index that points to the beginning
+ *                   of the line containing the marker, if found
+ */
+int find_disable_processing_comment_marker(const unc_text &text, std::size_t start_idx = 0);
+
+
+/**
+ * Test the input string to see if it satisfies the criteria
+ * specified by the enable_processing_cmt option
+ * @param  text      the string to which a match will be attempted
+ * @param  start_idx the starting index within the string from which the
+ *                   search will be performed
+ * @return           returns a non-negative position index that points to the end
+ *                   of the line containing the marker, if found
+ */
+int find_enable_processing_comment_marker(const unc_text &text, std::size_t start_idx = 0);
+
+
+/**
+ * @brief Parse the text into chunks
+ *
+ * This function parses or tokenizes the whole buffer into a list.
+ * It has to do some tricks to parse preprocessors.
+ *
+ * If output_text() were called immediately after, two things would happen:
+ *  - trailing whitespace are removed.
+ *  - leading space & tabs are converted to the appropriate format.
+ *
+ * All the tokens are inserted before ref. If ref is NULL, they are inserted
+ * at the end of the list.  Line numbers are relative to the start of the data.
+ */
+void tokenize(const std::deque<int> &data, chunk_t *ref);
+
+
+#endif /* TOKENIZE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.cpp
index 2cde16fb..5f7362b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.cpp
@@ -6,33 +6,22 @@
  *  - detect "version = 10;" vs "version (xxx) {"
  *
  * @author  Ben Gardner
- * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
+ * @author  Guy Maurel 2015, 2021
  * @license GPL v2+
  */
 
 #include "tokenize_cleanup.h"
 
-#include "char_table.h"
-#include "chunk_list.h"
 #include "combine.h"
 #include "combine_skip.h"
-#include "error_types.h"
 #include "flag_braced_init_list.h"
 #include "flag_decltype.h"
 #include "keywords.h"
-#include "language_tools.h"
-#include "log_rules.h"
 #include "prototypes.h"
 #include "punctuators.h"
 #include "space.h"
 #include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <vector>
-
-#include <cstring>
 
 using namespace uncrustify;
 
@@ -98,7 +87,7 @@ static chunk_t *handle_double_angle_close(chunk_t *pc)
 {
    chunk_t *next = chunk_get_next(pc);
 
-   if (next)
+   if (next != nullptr)
    {
       if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
          && chunk_is_token(next, CT_ANGLE_CLOSE)
@@ -110,7 +99,7 @@ static chunk_t *handle_double_angle_close(chunk_t *pc)
          set_chunk_type(pc, CT_SHIFT);
          pc->orig_col_end = next->orig_col_end;
 
-         chunk_t *tmp = chunk_get_next_ncnl(next);
+         chunk_t *tmp = chunk_get_next_ncnnl(next);
          chunk_del(next);
          next = tmp;
       }
@@ -171,15 +160,16 @@ void tokenize_trailing_return_types(void)
    // auto f24() const throw() -> bool = delete;
    chunk_t *pc;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
+      char copy[1000];
       LOG_FMT(LNOTE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(copy));
 
       if (  chunk_is_token(pc, CT_MEMBER)
          && (strcmp(pc->text(), "->") == 0))
       {
-         chunk_t *tmp = chunk_get_prev_ncnl(pc);
+         chunk_t *tmp = chunk_get_prev_ncnnl(pc);
          chunk_t *tmp_2;
          chunk_t *open_paren;
 
@@ -187,18 +177,18 @@ void tokenize_trailing_return_types(void)
          {
             // auto max(int a, int b) const -> int;
             // auto f11() const -> bool;
-            tmp = chunk_get_prev_ncnl(tmp);
+            tmp = chunk_get_prev_ncnnl(tmp);
          }
          else if (chunk_is_token(tmp, CT_NOEXCEPT))
          {
             // noexcept is present
-            tmp_2 = chunk_get_prev_ncnl(tmp);
+            tmp_2 = chunk_get_prev_ncnnl(tmp);
 
             if (chunk_is_token(tmp_2, CT_QUALIFIER))
             {
                // auto f12() const noexcept -> bool;
                // auto f15() const noexcept -> bool = delete;
-               tmp = chunk_get_prev_ncnl(tmp_2);
+               tmp = chunk_get_prev_ncnnl(tmp_2);
             }
             else
             {
@@ -210,12 +200,12 @@ void tokenize_trailing_return_types(void)
          else if (chunk_is_token(tmp, CT_PAREN_CLOSE))
          {
             open_paren = chunk_get_prev_type(tmp, CT_PAREN_OPEN, tmp->level);
-            tmp        = chunk_get_prev_ncnl(open_paren);
+            tmp        = chunk_get_prev_ncnnl(open_paren);
 
             if (chunk_is_token(tmp, CT_NOEXCEPT))
             {
                // noexcept is present
-               tmp_2 = chunk_get_prev_ncnl(tmp);
+               tmp_2 = chunk_get_prev_ncnnl(tmp);
 
                if (chunk_is_token(tmp_2, CT_QUALIFIER))
                {
@@ -223,7 +213,7 @@ void tokenize_trailing_return_types(void)
                   // auto f14() const noexcept(false) -> bool;
                   // auto f16() const noexcept(true) -> bool = delete;
                   // auto f17() const noexcept(false) -> bool = delete;
-                  tmp = chunk_get_prev_ncnl(tmp_2);
+                  tmp = chunk_get_prev_ncnnl(tmp_2);
                }
                else
                {
@@ -237,13 +227,13 @@ void tokenize_trailing_return_types(void)
             else if (chunk_is_token(tmp, CT_THROW))
             {
                // throw is present
-               tmp_2 = chunk_get_prev_ncnl(tmp);
+               tmp_2 = chunk_get_prev_ncnnl(tmp);
 
                if (chunk_is_token(tmp_2, CT_QUALIFIER))
                {
                   // auto f23() const throw() -> bool;
                   // auto f24() const throw() -> bool = delete;
-                  tmp = chunk_get_prev_ncnl(tmp_2);
+                  tmp = chunk_get_prev_ncnnl(tmp_2);
                }
                else
                {
@@ -263,7 +253,8 @@ void tokenize_trailing_return_types(void)
          }
 
          if (  chunk_is_token(tmp, CT_FPAREN_CLOSE)
-            && (get_chunk_parent_type(tmp) == CT_FUNC_PROTO || get_chunk_parent_type(tmp) == CT_FUNC_DEF))
+            && (  get_chunk_parent_type(tmp) == CT_FUNC_PROTO
+               || get_chunk_parent_type(tmp) == CT_FUNC_DEF))
          {
             set_chunk_type(pc, CT_TRAILING_RET);
             LOG_FMT(LNOTE, "%s(%d): set trailing return type for text() is '%s'\n",
@@ -290,11 +281,11 @@ void tokenize_cleanup(void)
     */
    chunk_t *pc;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (chunk_is_token(pc, CT_SQUARE_OPEN))
       {
-         next = chunk_get_next_ncnl(pc);
+         next = chunk_get_next_ncnnl(pc);
 
          if (chunk_is_token(next, CT_SQUARE_CLOSE))
          {
@@ -313,7 +304,7 @@ void tokenize_cleanup(void)
 
       if (  chunk_is_token(pc, CT_SEMICOLON)
          && pc->flags.test(PCF_IN_PREPROC)
-         && !chunk_get_next_ncnl(pc, scope_e::PREPROC))
+         && !chunk_get_next_ncnnl(pc, scope_e::PREPROC))
       {
          LOG_FMT(LNOTE, "%s(%d): %s:%zu Detected a macro that ends with a semicolon. Possible failures if used.\n",
                  __func__, __LINE__, cpd.filename.c_str(), pc->orig_line);
@@ -321,11 +312,11 @@ void tokenize_cleanup(void)
    }
 
    // change := to CT_SQL_ASSIGN Issue #527
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnl(pc))
+   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
    {
       if (chunk_is_token(pc, CT_COLON))
       {
-         next = chunk_get_next_ncnl(pc);
+         next = chunk_get_next_ncnnl(pc);
 
          if (chunk_is_token(next, CT_ASSIGN))
          {
@@ -340,16 +331,19 @@ void tokenize_cleanup(void)
 
    // We can handle everything else in the second pass
    pc   = chunk_get_head();
-   next = chunk_get_next_ncnl(pc);
+   next = chunk_get_next_ncnnl(pc);
 
-   while (pc != nullptr && next != nullptr)
+   while (  pc != nullptr
+         && next != nullptr)
    {
-      if (chunk_is_token(pc, CT_DOT) && language_is_set(LANG_ALLC))
+      if (  chunk_is_token(pc, CT_DOT)
+         && language_is_set(LANG_ALLC))
       {
          set_chunk_type(pc, CT_MEMBER);
       }
 
-      if (chunk_is_token(pc, CT_NULLCOND) && language_is_set(LANG_CS))
+      if (  chunk_is_token(pc, CT_NULLCOND)
+         && language_is_set(LANG_CS))
       {
          set_chunk_type(pc, CT_MEMBER);
       }
@@ -393,13 +387,15 @@ void tokenize_cleanup(void)
        * var x = (T)base.y;
        */
       if (  chunk_is_token(pc, CT_BASE)
-         && (chunk_is_token(next, CT_PAREN_OPEN) || chunk_is_token(next, CT_DOT)))
+         && (  chunk_is_token(next, CT_PAREN_OPEN)
+            || chunk_is_token(next, CT_DOT)))
       {
          set_chunk_type(pc, CT_WORD);
       }
 
       if (  chunk_is_token(pc, CT_ENUM)
-         && (chunk_is_token(next, CT_STRUCT) || chunk_is_token(next, CT_CLASS)))
+         && (  chunk_is_token(next, CT_STRUCT)
+            || chunk_is_token(next, CT_CLASS)))
       {
          set_chunk_type(next, CT_ENUM_CLASS);
       }
@@ -443,9 +439,10 @@ void tokenize_cleanup(void)
          else
          {
             // Something else followed by a open brace
-            chunk_t *tmp = chunk_get_next_ncnl(next);
+            chunk_t *tmp = chunk_get_next_ncnnl(next);
 
-            if (tmp == nullptr || tmp->type != CT_BRACE_OPEN)
+            if (  tmp == nullptr
+               || tmp->type != CT_BRACE_OPEN)
             {
                set_chunk_type(pc, CT_QUALIFIER);
             }
@@ -459,8 +456,11 @@ void tokenize_cleanup(void)
        *     CT_WORD which is preceded by CT_DC_MEMBER: '::aaa *b'
        */
       if (  (chunk_is_token(next, CT_STAR))
-         || (language_is_set(LANG_CPP) && (chunk_is_token(next, CT_CARET)))
-         || (language_is_set(LANG_CS) && (chunk_is_token(next, CT_QUESTION)) && (strcmp(pc->text(), "null") != 0)))
+         || (  language_is_set(LANG_CPP)
+            && (chunk_is_token(next, CT_CARET)))
+         || (  language_is_set(LANG_CS)
+            && (chunk_is_token(next, CT_QUESTION))
+            && (strcmp(pc->text(), "null") != 0)))
       {
          if (  chunk_is_token(pc, CT_TYPE)
             || chunk_is_token(pc, CT_QUALIFIER)
@@ -558,7 +558,7 @@ void tokenize_cleanup(void)
             pc->orig_col  = prev->orig_col;
             pc->orig_line = prev->orig_line;
             chunk_t *to_be_deleted = prev;
-            prev = chunk_get_prev_ncnl(prev);
+            prev = chunk_get_prev_ncnnl(prev);
 
             if (prev != nullptr)
             {
@@ -573,7 +573,23 @@ void tokenize_cleanup(void)
          if (  chunk_is_token(pc, CT_WORD)
             && chunk_is_token(next, CT_DC_MEMBER))
          {
-            set_chunk_type(pc, CT_TYPE);
+            prev = chunk_get_prev(pc);
+
+            if (prev == nullptr)                  // Issue #3010
+            {
+               set_chunk_type(pc, CT_TYPE);
+            }
+            else
+            {
+               if (chunk_is_token(prev, CT_COLON))
+               {
+                  // nothing to do
+               }
+               else
+               {
+                  set_chunk_type(pc, CT_TYPE);
+               }
+            }
          }
 
          // Set parent type for 'if constexpr'
@@ -733,7 +749,8 @@ void tokenize_cleanup(void)
       if (chunk_is_token(pc, CT_ACCESS))
       {
          // Handle Qt slots - maybe should just check for a CT_WORD?
-         if (chunk_is_str(next, "slots", 5) || chunk_is_str(next, "Q_SLOTS", 7))
+         if (  chunk_is_str(next, "slots", 5)
+            || chunk_is_str(next, "Q_SLOTS", 7))
          {
             chunk_t *tmp = chunk_get_next(next);
 
@@ -748,7 +765,7 @@ void tokenize_cleanup(void)
             set_chunk_type(next, CT_ACCESS_COLON);
             chunk_t *tmp;
 
-            if ((tmp = chunk_get_next_ncnl(next)) != nullptr)
+            if ((tmp = chunk_get_next_ncnnl(next)) != nullptr)
             {
                chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
             }
@@ -762,11 +779,15 @@ void tokenize_cleanup(void)
       }
 
       // Look for <newline> 'EXEC' 'SQL'
-      if (  (chunk_is_str_case(pc, "EXEC", 4) && chunk_is_str_case(next, "SQL", 3))
-         || (  (*pc->str.c_str() == '$') && pc->type != CT_SQL_WORD
+      if (  (  chunk_is_str_case(pc, "EXEC", 4)
+            && chunk_is_str_case(next, "SQL", 3))
+         || (  (*pc->str.c_str() == '$')
+            && pc->type != CT_SQL_WORD
                /* but avoid breaking tokenization for C# 6 interpolated strings. */
             && (  !language_is_set(LANG_CS)
-               || ((chunk_is_token(pc, CT_STRING)) && (!pc->str.startswith("$\"")) && (!pc->str.startswith("$@\""))))))
+               || (  chunk_is_token(pc, CT_STRING)
+                  && (!pc->str.startswith("$\""))
+                  && (!pc->str.startswith("$@\""))))))
       {
          chunk_t *tmp = chunk_get_prev(pc);
 
@@ -823,7 +844,7 @@ void tokenize_cleanup(void)
                {
                   set_chunk_type(tmp, CT_SQL_WORD);
                }
-               tmp = chunk_get_next_ncnl(tmp);
+               tmp = chunk_get_next_ncnnl(tmp);
             }
          }
       }
@@ -838,21 +859,22 @@ void tokenize_cleanup(void)
          pc->str         += next->str;
          pc->orig_col_end = next->orig_col_end;
          chunk_del(next);
-         next = chunk_get_next_ncnl(pc);
+         next = chunk_get_next_ncnnl(pc);
 
          // label the 'in'
          if (chunk_is_token(next, CT_PAREN_OPEN))
          {
-            chunk_t *tmp = chunk_get_next_ncnl(next);
+            chunk_t *tmp = chunk_get_next_ncnnl(next);
 
-            while (tmp && tmp->type != CT_PAREN_CLOSE)
+            while (  tmp != nullptr
+                  && tmp->type != CT_PAREN_CLOSE)
             {
                if (chunk_is_str(tmp, "in", 2))
                {
                   set_chunk_type(tmp, CT_IN);
                   break;
                }
-               tmp = chunk_get_next_ncnl(tmp);
+               tmp = chunk_get_next_ncnnl(tmp);
             }
          }
       }
@@ -879,8 +901,10 @@ void tokenize_cleanup(void)
          }
 
          // Fix self keyword back to word when mixing c++/objective-c
-         if (  chunk_is_token(pc, CT_THIS) && !strcmp(pc->text(), "self")
-            && (chunk_is_token(next, CT_COMMA) || chunk_is_token(next, CT_PAREN_CLOSE)))
+         if (  chunk_is_token(pc, CT_THIS)
+            && !strcmp(pc->text(), "self")
+            && (  chunk_is_token(next, CT_COMMA)
+               || chunk_is_token(next, CT_PAREN_CLOSE)))
          {
             set_chunk_type(pc, CT_WORD);
          }
@@ -888,7 +912,8 @@ void tokenize_cleanup(void)
          // Fix self keyword back to word when mixing c++/objective-c
          if (  chunk_is_token(pc, CT_THIS)
             && !strcmp(pc->text(), "self")
-            && (chunk_is_token(next, CT_COMMA) || chunk_is_token(next, CT_PAREN_CLOSE)))
+            && (  chunk_is_token(next, CT_COMMA)
+               || chunk_is_token(next, CT_PAREN_CLOSE)))
          {
             set_chunk_type(pc, CT_WORD);
          }
@@ -896,7 +921,10 @@ void tokenize_cleanup(void)
 
       // Another hack to clean up more keyword abuse
       if (  chunk_is_token(pc, CT_CLASS)
-         && (chunk_is_token(prev, CT_DOT) || chunk_is_token(next, CT_DOT)))
+         && (  chunk_is_token(prev, CT_DOT)
+            || chunk_is_token(next, CT_DOT)
+            || chunk_is_token(prev, CT_MEMBER)  // Issue #3031
+            || chunk_is_token(next, CT_MEMBER)))
       {
          set_chunk_type(pc, CT_WORD);
       }
@@ -912,7 +940,7 @@ void tokenize_cleanup(void)
          }
          set_chunk_parent(next, pc->type);
 
-         chunk_t *tmp = chunk_get_next_ncnl(next);
+         chunk_t *tmp = chunk_get_next_ncnnl(next);
 
          if (tmp != nullptr)
          {
@@ -928,9 +956,10 @@ void tokenize_cleanup(void)
 
       if (chunk_is_token(pc, CT_OC_INTF))
       {
-         chunk_t *tmp = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+         chunk_t *tmp = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
 
-         while (tmp != nullptr && tmp->type != CT_OC_END)
+         while (  tmp != nullptr
+               && tmp->type != CT_OC_END)
          {
             if (get_token_pattern_class(tmp->type) != pattern_class_e::NONE)
             {
@@ -939,7 +968,7 @@ void tokenize_cleanup(void)
                        get_token_name(tmp->type));
                set_chunk_type(tmp, CT_WORD);
             }
-            tmp = chunk_get_next_ncnl(tmp, scope_e::PREPROC);
+            tmp = chunk_get_next_ncnnl(tmp, scope_e::PREPROC);
          }
       }
 
@@ -959,7 +988,8 @@ void tokenize_cleanup(void)
 
          chunk_t *tmp = chunk_get_next(next);
 
-         if (tmp != nullptr && tmp->next != nullptr)
+         if (  tmp != nullptr
+            && tmp->next != nullptr)
          {
             if (chunk_is_token(tmp, CT_PAREN_CLOSE))
             {
@@ -1015,7 +1045,7 @@ void tokenize_cleanup(void)
             set_chunk_type(tmp, CT_OC_SEL_NAME);
             set_chunk_parent(tmp, pc->type);
 
-            while ((tmp = chunk_get_next_ncnl(tmp)) != nullptr)
+            while ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
             {
                if (chunk_is_token(tmp, CT_PAREN_CLOSE))
                {
@@ -1056,13 +1086,15 @@ void tokenize_cleanup(void)
          set_chunk_type(pc, CT_SIZEOF);
       }
 
-      if (chunk_is_token(pc, CT_UNSAFE) && next->type != CT_BRACE_OPEN)
+      if (  chunk_is_token(pc, CT_UNSAFE)
+         && next->type != CT_BRACE_OPEN)
       {
          set_chunk_type(pc, CT_QUALIFIER);
       }
 
       if (  (  chunk_is_token(pc, CT_USING)
-            || (chunk_is_token(pc, CT_TRY) && language_is_set(LANG_JAVA)))
+            || (  chunk_is_token(pc, CT_TRY)
+               && language_is_set(LANG_JAVA)))
          && chunk_is_token(next, CT_PAREN_OPEN))
       {
          set_chunk_type(pc, CT_USING_STMT);
@@ -1115,17 +1147,33 @@ void tokenize_cleanup(void)
 
       prev = pc;
       pc   = next;
-      next = chunk_get_next_ncnl(pc);
+      next = chunk_get_next_ncnnl(pc);
    }
 } // tokenize_cleanup
 
 
+bool invalid_open_angle_template(chunk_t *prev)
+{
+   if (prev == nullptr)
+   {
+      return(false);
+   }
+   // A template requires a word/type right before the open angle
+   return(  prev->type != CT_WORD
+         && prev->type != CT_TYPE
+         && prev->type != CT_COMMA
+         && prev->type != CT_QUALIFIER
+         && prev->type != CT_OPERATOR_VAL
+         && get_chunk_parent_type(prev) != CT_OPERATOR);
+}
+
+
 static void check_template(chunk_t *start, bool in_type_cast)
 {
    LOG_FMT(LTEMPL, "%s(%d): orig_line %zu, orig_col %zu:\n",
            __func__, __LINE__, start->orig_line, start->orig_col);
 
-   chunk_t *prev = chunk_get_prev_ncnl(start, scope_e::PREPROC);
+   chunk_t *prev = chunk_get_prev_ncnnl(start, scope_e::PREPROC);
 
    if (prev == nullptr)
    {
@@ -1142,14 +1190,15 @@ static void check_template(chunk_t *start, bool in_type_cast)
       size_t level  = 1;
       size_t parens = 0;
 
-      for (pc = chunk_get_next_ncnl(start, scope_e::PREPROC);
+      for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
            pc != nullptr;
-           pc = chunk_get_next_ncnl(pc, scope_e::PREPROC))
+           pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
       {
          LOG_FMT(LTEMPL, "%s(%d): type is %s, level is %zu\n",
                  __func__, __LINE__, get_token_name(pc->type), level);
 
-         if ((pc->str[0] == '>') && (pc->len() > 1))
+         if (  (pc->str[0] == '>')
+            && (pc->len() > 1))
          {
             if (pc->str[1] == '=')                         // Issue #1462 and #2565
             {
@@ -1227,13 +1276,7 @@ static void check_template(chunk_t *start, bool in_type_cast)
        * then it isn't a template.
        */
 
-      // A template requires a word/type right before the open angle
-      if (  prev->type != CT_WORD
-         && prev->type != CT_TYPE
-         && prev->type != CT_COMMA
-         && prev->type != CT_QUALIFIER
-         && prev->type != CT_OPERATOR_VAL
-         && get_chunk_parent_type(prev) != CT_OPERATOR)
+      if (invalid_open_angle_template(prev))
       {
          LOG_FMT(LTEMPL, "%s(%d): - after type %s + ( - Not a template\n",
                  __func__, __LINE__, get_token_name(prev->type));
@@ -1248,9 +1291,10 @@ static void check_template(chunk_t *start, bool in_type_cast)
       bool hit_semicolon = false;
       pc = start;
 
-      while ((pc = chunk_get_prev_ncnl(pc, scope_e::PREPROC)) != nullptr)
+      while ((pc = chunk_get_prev_ncnnl(pc, scope_e::PREPROC)) != nullptr)
       {
-         if (  (chunk_is_token(pc, CT_SEMICOLON) && hit_semicolon)
+         if (  (  chunk_is_token(pc, CT_SEMICOLON)
+               && hit_semicolon)
             || chunk_is_token(pc, CT_SQUARE_CLOSE))
          {
             break;
@@ -1278,16 +1322,19 @@ static void check_template(chunk_t *start, bool in_type_cast)
             break;
          }
 
-         if (chunk_is_token(pc, CT_SEMICOLON) && !hit_semicolon)
+         if (  chunk_is_token(pc, CT_SEMICOLON)
+            && !hit_semicolon)
          {
             hit_semicolon = true;
          }
 
-         if (  ((  chunk_is_token(pc, CT_IF)
-                || chunk_is_token(pc, CT_RETURN)
-                || chunk_is_token(pc, CT_WHILE)
-                || chunk_is_token(pc, CT_WHILE_OF_DO)) && hit_semicolon == false)
-            || (chunk_is_token(pc, CT_FOR) && hit_semicolon == true))
+         if (  (  (  chunk_is_token(pc, CT_IF)
+                  || chunk_is_token(pc, CT_RETURN)
+                  || chunk_is_token(pc, CT_WHILE)
+                  || chunk_is_token(pc, CT_WHILE_OF_DO))
+               && !hit_semicolon)
+            || (  chunk_is_token(pc, CT_FOR)
+               && hit_semicolon))
          {
             in_if = true;
             break;
@@ -1303,21 +1350,35 @@ static void check_template(chunk_t *start, bool in_type_cast)
 
       tokens[0] = CT_ANGLE_OPEN;
 
-      for (pc = chunk_get_next_ncnl(start, scope_e::PREPROC);
+      for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
            pc != nullptr;
-           pc = chunk_get_next_ncnl(pc, scope_e::PREPROC))
+           pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
       {
-         LOG_FMT(LTEMPL, "%s(%d): type is %s, num_tokens is %zu\n",
-                 __func__, __LINE__, get_token_name(pc->type), num_tokens);
+         constexpr static auto LCURRENT = LTEMPL;
+
+         LOG_FMT(LTEMPL, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, type is %s, num_tokens is %zu\n",
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), num_tokens);
 
          log_rule_B("tok_split_gte");
 
+         if (chunk_is_token(pc, CT_BRACE_OPEN))                     // Issue #2886
+         {
+            // look for the closing brace
+            chunk_t *A = chunk_skip_to_match(pc);
+            LOG_FMT(LTEMPL, "%s(%d): A->orig_line is %zu, A->orig_col is %zu, type is %s\n",
+                    __func__, __LINE__, A->orig_line, A->orig_col, get_token_name(A->type));
+            pc = chunk_get_next(A);
+         }
+
          if (  (tokens[num_tokens - 1] == CT_ANGLE_OPEN)
             && (pc->str[0] == '>')
             && (pc->len() > 1)
             && (  options::tok_split_gte()
-               || (  (chunk_is_str(pc, ">>", 2) || chunk_is_str(pc, ">>>", 3))
-                  && (num_tokens >= 2 || (num_tokens >= 1 && in_type_cast)))))
+               || (  (  chunk_is_str(pc, ">>", 2)
+                     || chunk_is_str(pc, ">>>", 3))
+                  && (  num_tokens >= 2
+                     || (  num_tokens >= 1
+                        && in_type_cast)))))
          {
             LOG_FMT(LTEMPL, "%s(%d): {split '%s' at orig_line %zu, orig_col %zu}\n",
                     __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
@@ -1327,8 +1388,16 @@ static void check_template(chunk_t *start, bool in_type_cast)
 
          if (chunk_is_str(pc, "<", 1))
          {
-            tokens[num_tokens] = CT_ANGLE_OPEN;
-            num_tokens++;
+            if (  num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN)
+               && invalid_open_angle_template(pc->prev))
+            {
+               set_chunk_type(pc, CT_COMPARE); // Issue #3127
+            }
+            else
+            {
+               tokens[num_tokens] = CT_ANGLE_OPEN;
+               num_tokens++;
+            }
          }
          else if (chunk_is_str(pc, ">", 1))
          {
@@ -1346,7 +1415,8 @@ static void check_template(chunk_t *start, bool in_type_cast)
             }
          }
          else if (  in_if
-                 && (chunk_is_token(pc, CT_BOOL) || chunk_is_token(pc, CT_COMPARE)))
+                 && (  chunk_is_token(pc, CT_BOOL)
+                    || chunk_is_token(pc, CT_COMPARE)))
          {
             break;
          }
@@ -1357,7 +1427,7 @@ static void check_template(chunk_t *start, bool in_type_cast)
             {
                break;
             }
-            auto brace_open  = chunk_get_next_ncnl(pc);
+            auto brace_open  = chunk_get_next_ncnnl(pc);
             auto brace_close = chunk_skip_to_match(brace_open);
 
             set_chunk_parent(brace_open, CT_BRACED_INIT_LIST);
@@ -1410,9 +1480,10 @@ static void check_template(chunk_t *start, bool in_type_cast)
 
    if (chunk_is_token(end, CT_ANGLE_CLOSE))
    {
-      pc = chunk_get_next_ncnl(end, scope_e::PREPROC);
+      pc = chunk_get_next_ncnnl(end, scope_e::PREPROC);
 
-      if (pc == nullptr || pc->type != CT_NUMBER)
+      if (  pc == nullptr
+         || pc->type != CT_NUMBER)
       {
          LOG_FMT(LTEMPL, "%s(%d): Template detected\n", __func__, __LINE__);
          LOG_FMT(LTEMPL, "%s(%d):     from orig_line %zu, orig_col %zu\n",
@@ -1429,7 +1500,7 @@ static void check_template(chunk_t *start, bool in_type_cast)
       }
    }
    LOG_FMT(LTEMPL, "%s(%d): - Not a template: end = %s\n",
-           __func__, __LINE__, (end != NULL) ? get_token_name(end->type) : "<null>");
+           __func__, __LINE__, (end != nullptr) ? get_token_name(end->type) : "<null>");
    set_chunk_type(start, CT_COMPARE);
 } // check_template
 
@@ -1457,11 +1528,12 @@ static void check_template_arg(chunk_t *start, chunk_t *end)
 
    while (pc != end)
    {
-      chunk_t *next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
       // a test "if (next == nullptr)" is not necessary
       chunk_flags_set(pc, PCF_IN_TEMPLATE);
 
-      if (chunk_is_token(pc, CT_DECLTYPE) || chunk_is_token(pc, CT_SIZEOF))
+      if (  chunk_is_token(pc, CT_DECLTYPE)
+         || chunk_is_token(pc, CT_SIZEOF))
       {
          expressionIsNumeric = true;
          break;
@@ -1489,7 +1561,7 @@ static void check_template_arg(chunk_t *start, chunk_t *end)
 
       while (pc != end)
       {
-         chunk_t *next = chunk_get_next_ncnl(pc, scope_e::PREPROC);
+         chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
          // a test "if (next == nullptr)" is not necessary
          chunk_flags_set(pc, PCF_IN_TEMPLATE);
 
@@ -1510,9 +1582,9 @@ static void check_template_args(chunk_t *start, chunk_t *end)
    // Scan for commas
    chunk_t *pc;
 
-   for (pc = chunk_get_next_ncnl(start, scope_e::PREPROC);
+   for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
         pc != nullptr && pc != end;
-        pc = chunk_get_next_ncnl(pc, scope_e::PREPROC))
+        pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
    {
       switch (pc->type)
       {
@@ -1533,7 +1605,8 @@ static void check_template_args(chunk_t *start, chunk_t *end)
 
       case CT_ANGLE_CLOSE:
 
-         if (!tokens.empty() && tokens.back() == CT_ANGLE_OPEN)
+         if (  !tokens.empty()
+            && tokens.back() == CT_ANGLE_OPEN)
          {
             tokens.pop_back();
          }
@@ -1541,7 +1614,8 @@ static void check_template_args(chunk_t *start, chunk_t *end)
 
       case CT_PAREN_CLOSE:
 
-         if (!tokens.empty() && tokens.back() == CT_PAREN_OPEN)
+         if (  !tokens.empty()
+            && tokens.back() == CT_PAREN_OPEN)
          {
             tokens.pop_back();
          }
@@ -1563,7 +1637,7 @@ static void cleanup_objc_property(chunk_t *start)
 
    chunk_t *open_paren = chunk_get_next_type(start, CT_PAREN_OPEN, start->level);
 
-   if (!open_paren)
+   if (open_paren == nullptr)
    {
       LOG_FMT(LTEMPL, "%s(%d): Property is not followed by openning paren\n", __func__, __LINE__);
       return;
@@ -1572,18 +1646,18 @@ static void cleanup_objc_property(chunk_t *start)
 
    chunk_t *tmp = chunk_get_next_type(start, CT_PAREN_CLOSE, start->level);
 
-   if (tmp != NULL)
+   if (tmp != nullptr)
    {
       set_chunk_parent(tmp, start->type);
-      tmp = chunk_get_next_ncnl(tmp);
+      tmp = chunk_get_next_ncnnl(tmp);
 
-      if (tmp != NULL)
+      if (tmp != nullptr)
       {
          chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
 
          tmp = chunk_get_next_type(tmp, CT_SEMICOLON, start->level);
 
-         if (tmp != NULL)
+         if (tmp != nullptr)
          {
             set_chunk_parent(tmp, start->type);
          }
@@ -1600,18 +1674,21 @@ static void mark_selectors_in_property_with_open_paren(chunk_t *open_paren)
 
    chunk_t *tmp = open_paren;
 
-   while (tmp && tmp->type != CT_PAREN_CLOSE)
+   while (  tmp != nullptr
+         && tmp->type != CT_PAREN_CLOSE)
    {
       if (  chunk_is_token(tmp, CT_WORD)
-         && (chunk_is_str(tmp, "setter", 6) || chunk_is_str(tmp, "getter", 6)))
+         && (  chunk_is_str(tmp, "setter", 6)
+            || chunk_is_str(tmp, "getter", 6)))
       {
          tmp = tmp->next;
 
-         while (  tmp
+         while (  tmp != nullptr
                && tmp->type != CT_COMMA
                && tmp->type != CT_PAREN_CLOSE)
          {
-            if (chunk_is_token(tmp, CT_WORD) || chunk_is_str(tmp, ":", 1))
+            if (  chunk_is_token(tmp, CT_WORD)
+               || chunk_is_str(tmp, ":", 1))
             {
                set_chunk_type(tmp, CT_OC_SEL_NAME);
             }
@@ -1632,10 +1709,13 @@ static void mark_attributes_in_property_with_open_paren(chunk_t *open_paren)
 
    chunk_t *tmp = open_paren;
 
-   while (tmp && tmp->type != CT_PAREN_CLOSE)
+   while (  tmp != nullptr
+         && tmp->type != CT_PAREN_CLOSE)
    {
-      if (  (chunk_is_token(tmp, CT_COMMA) || chunk_is_token(tmp, CT_PAREN_OPEN))
-         && (chunk_is_token(tmp->next, CT_WORD) || chunk_is_token(tmp->next, CT_TYPE)))
+      if (  (  chunk_is_token(tmp, CT_COMMA)
+            || chunk_is_token(tmp, CT_PAREN_OPEN))
+         && (  chunk_is_token(tmp->next, CT_WORD)
+            || chunk_is_token(tmp->next, CT_TYPE)))
       {
          set_chunk_type(tmp->next, CT_OC_PROPERTY_ATTR);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.h
index 4d85cfc4..4d85cfc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/tokenize_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/tokenize_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_ctype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_ctype.h
index 6b9f2e1a..50b7a6f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_ctype.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_ctype.h
@@ -8,20 +8,26 @@
  * @author  Ben Gardner
  * @license GPL v2+
  */
+
 #ifndef UNC_CTYPE_H_INCLUDED
 #define UNC_CTYPE_H_INCLUDED
 
 #include "options.h"
 
-#include <cctype>
+#include <cctype>                    // to get std::tolower
 
 // TODO: better avoid inline and move implementation to cpp file
 
 
-//! Truncate anything except EOF (-1) to 0-255
+//! Test anything EOF (-1) to 0-255
 static inline int unc_fix_ctype(int ch)
 {
-   return((ch == -1) ? -1 : (ch & 0xff));
+   if (  ch >= -1
+      && ch <= 255)
+   {
+      return(ch);
+   }
+   return(0);                                // Issue #3025
 }
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_text.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.cpp
index 936e208b..1f96a67c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_text.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.cpp
@@ -533,7 +533,9 @@ void unc_text::append(int ch)
 {
    m_logtext.pop_back();
 
-   if (ch < 0x80 && ch != '\n' && ch != '\r')
+   if (  ch < 0x80
+      && ch != '\n'
+      && ch != '\r')
    {
       m_logtext.push_back(ch);
    }
@@ -595,7 +597,10 @@ bool unc_text::startswith(const char *text, size_t idx) const
 {
    const auto orig_idx = idx;
 
-   for ( ; idx < size() && *text; idx++, text++)
+   for ( ;
+         (  idx < size()
+         && *text);
+         idx++, text++)
    {
       if (*text != m_chars[idx])
       {
@@ -603,7 +608,8 @@ bool unc_text::startswith(const char *text, size_t idx) const
       }
    }
 
-   return(idx != orig_idx && (*text == 0));
+   return(  idx != orig_idx
+         && (*text == 0));
 }
 
 
@@ -612,7 +618,10 @@ bool unc_text::startswith(const unc_text &text, size_t idx) const
    size_t     si       = 0;
    const auto orig_idx = idx;
 
-   for ( ; idx < size() && si < text.size(); idx++, si++)
+   for ( ;
+         (  idx < size()
+         && si < text.size());
+         idx++, si++)
    {
       if (text.m_chars[si] != m_chars[idx])
       {
@@ -620,7 +629,8 @@ bool unc_text::startswith(const unc_text &text, size_t idx) const
       }
    }
 
-   return(idx != orig_idx && (si == text.size()));
+   return(  idx != orig_idx
+         && (si == text.size()));
 }
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_text.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.h
index dd678f16..dd678f16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_text.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_text.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.cpp
index b5ad589f..83e50c7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.cpp
@@ -3,7 +3,7 @@
  * This file contains lot of tools for debugging
  *
  * @author  Guy Maurel
- *          October 2015- 2020
+ *          October 2015- 2021
  * @license GPL v2+
  */
 
@@ -11,7 +11,6 @@
 
 #include "args.h"
 #include "output.h"
-#include "uncrustify.h"
 
 
 /*
@@ -109,8 +108,9 @@ void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsig
             {
                LOG_FMT(LGUY, "text() '%s', ", pc->text());
             }
-            LOG_FMT(LGUY, " column is %zu, type is %s, parent_type is %s, orig_col is %zu,",
-                    pc->column, get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)), pc->orig_col);
+            LOG_FMT(LGUY, " column is %zu, pp_level is %zu, type is %s, parent_type is %s, orig_col is %zu,",
+                    pc->column, pc->pp_level, get_token_name(pc->type),
+                    get_token_name(get_chunk_parent_type(pc)), pc->orig_col);
 
             if (chunk_is_token(pc, CT_IGNORED))
             {
@@ -121,13 +121,79 @@ void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsig
                LOG_FMT(LGUY, " pc->flags: ");
                log_pcf_flags(LGUY, pc->flags);
             }
-            //LOG_FMT(LALAGAIN, "   align.right_align is %s\n", pc->align.right_align ? "TRUE" : "FALSE");
+
+            if (pc->tracking != nullptr)
+            {
+               LOG_FMT(LGUY, " Tracking info are: \n");
+               LOG_FMT(LGUY, "  number of track(s) %zu\n", pc->tracking->size());
+
+               for (size_t track = 0; track < pc->tracking->size(); track++)
+               {
+                  track_list *A       = pc->tracking;
+                  Track_nr   B        = A->at(track);
+                  size_t     Bfirst   = B.first;
+                  char       *Bsecond = B.second;
+
+                  LOG_FMT(LGUY, "  %zu, tracking number is %zu\n", track, Bfirst);
+                  LOG_FMT(LGUY, "  %zu, rule            is %s\n", track, Bsecond);
+               }
+            }
          }
       }
    }
 
    LOG_FMT(LGUY, "\n");
-} // prot_the_line
+} // prot_the_line_pc
+
+
+void prot_all_lines(const char *func_name, int theLine)
+{
+   counter++;
+   tokenCounter = 0;
+   size_t lineNumber = 1;
+
+   LOG_FMT(LGUY, "Prot_all_lines:(%s:%d)(%zu)\n", func_name, theLine, counter);
+
+   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = pc->next)
+   {
+      tokenCounter++;
+
+      LOG_FMT(LGUY, " orig_line is %zu,%zu, pp_level is %zu, ", lineNumber, tokenCounter, pc->pp_level);
+
+      if (chunk_is_token(pc, CT_VBRACE_OPEN))
+      {
+         LOG_FMT(LGUY, "<VBRACE_OPEN>, ");
+      }
+      else if (chunk_is_token(pc, CT_NEWLINE))
+      {
+         LOG_FMT(LGUY, "<NL>(nl_count is %zu), ", pc->nl_count);
+         tokenCounter = 0;
+         lineNumber   = lineNumber + pc->nl_count;
+      }
+      else if (chunk_is_token(pc, CT_VBRACE_CLOSE))
+      {
+         LOG_FMT(LGUY, "<CT_VBRACE_CLOSE>, ");
+      }
+      else if (chunk_is_token(pc, CT_VBRACE_OPEN))
+      {
+         LOG_FMT(LGUY, "<CT_VBRACE_OPEN>, ");
+      }
+      else if (chunk_is_token(pc, CT_SPACE))
+      {
+         LOG_FMT(LGUY, "<CT_SPACE>, ");
+      }
+      else if (chunk_is_token(pc, CT_IGNORED))
+      {
+         LOG_FMT(LGUY, "<IGNORED> ");
+      }
+      else
+      {
+         LOG_FMT(LGUY, "text() '%s', ", pc->text());
+      }
+      LOG_FMT(LGUY, " column is %zu, type is %s\n",
+              pc->column, get_token_name(pc->type));
+   }
+} // prot_all_lines
 
 
 void prot_the_source(int theLine)
@@ -152,7 +218,8 @@ void examine_Data(const char *func_name, int theLine, int what)
 
       for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
       {
-         if (chunk_is_token(pc, CT_SQUARE_CLOSE) || chunk_is_token(pc, CT_TSQUARE))
+         if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
+            || chunk_is_token(pc, CT_TSQUARE))
          {
             LOG_FMT(LGUY, "\n");
             LOG_FMT(LGUY, "1:(%d),", theLine);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.h
index 04fdfccb..3ee393d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unc_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unc_tools.h
@@ -2,16 +2,14 @@
  * @file unc_tools.h
  *
  * @author  Guy Maurel
- *          October 2015, 2016, 2017, 2018, 2019
+ *          October 2015, 2016, 2017, 2018, 2019, 2020, 2021
  * @license GPL v2+
  */
 
 #ifndef UNC_TOOLS_H_INCLUDED
 #define UNC_TOOLS_H_INCLUDED
 
-#include "chunk_list.h"
 #include "prototypes.h"
-#include "uncrustify_types.h"
 
 #if defined DEBUG
 #define PROT_THE_LINE    prot_the_line(__func__, __LINE__, 0, 0);
@@ -26,6 +24,9 @@ void prot_the_line(const char *func_name, int theLine, unsigned int actual_line,
 void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsigned int actual_line, size_t partNumber);
 
 
+void prot_all_lines(const char *func_name, int theLine);
+
+
 void prot_the_source(int theLine);
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.cpp
index 69b57a05..bc01f53e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.cpp
@@ -18,7 +18,6 @@
 #include "backup.h"
 #include "brace_cleanup.h"
 #include "braces.h"
-#include "chunk_list.h"
 #include "combine.h"
 #include "compat.h"
 #include "detect.h"
@@ -26,41 +25,26 @@
 #include "indent.h"
 #include "keywords.h"
 #include "lang_pawn.h"
-#include "language_tools.h"
-#include "log_levels.h"
-#include "log_rules.h"
-#include "logger.h"
-#include "md5.h"
 #include "newlines.h"
-#include "options.h"
 #include "output.h"
 #include "parens.h"
-#include "pcf_flags.h"
-#include "prototypes.h"
+#include "parent_for_pp.h"
 #include "remove_extra_returns.h"
 #include "semicolons.h"
 #include "sorting.h"
 #include "space.h"
-#include "token_enum.h"
 #include "token_names.h"
 #include "tokenize.h"
 #include "tokenize_cleanup.h"
 #include "unc_ctype.h"
 #include "unc_tools.h"
-#include "uncrustify_types.h"
 #include "uncrustify_version.h"
 #include "unicode.h"
 #include "universalindentgui.h"
 #include "width.h"
 
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <deque>
 #include <fcntl.h>
 #include <map>
-#include <vector>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -90,6 +74,7 @@
 #define NODISCARD
 #endif
 
+constexpr static auto LCURRENT = LUNC;
 
 using namespace std;
 using namespace uncrustify;
@@ -201,7 +186,8 @@ const char *path_basename(const char *path)
       path++;
 
       // Check both slash types to support Linux and Windows
-      if ((ch == '/') || (ch == '\\'))
+      if (  (ch == '/')
+         || (ch == '\\'))
       {
          last_path = path;
       }
@@ -300,13 +286,13 @@ void usage(const char *argv0)
            " --set <option>=<value>   : Sets a new value to a config option.\n"
            "\n"
            "Debug Options:\n"
-           " -p FILE            : Dump debug info into FILE, or to stdout if FILE is set to '-'.\n"
-           "                      Must be used in combination with '-f FILE'.\n"
-           " --debug-csv-format : Dump debug info to file in csv-delimited format.\n"
-           "                      Must be used in combination with '-p FILE', where FILE is not set to '-'\n"
-           " -L SEV             : Set the log severity (see log_levels.h; note 'A' = 'all')\n"
-           " -s                 : Show the log severity in the logs.\n"
-           " --decode           : Decode remaining args (chunk flags) and exit.\n"
+           " -p FILE               : Dump debug info into FILE, or to stdout if FILE is set to '-'.\n"
+           "                         Must be used in combination with '-f FILE'\n"
+           " -L SEV                : Set the log severity (see log_levels.h; note 'A' = 'all')\n"
+           " -s                    : Show the log severity in the logs.\n"
+           " --decode              : Decode remaining args (chunk flags) and exit.\n"
+           " --tracking_space FILE : Prepare tracking informations for debugging.\n"
+           "                         Cannot be used with the -o option'\n"
            "\n"
            "Usage Examples\n"
            "cat foo.d | uncrustify -q -c my.cfg -l d\n"
@@ -457,7 +443,8 @@ int main(int argc, char *argv[])
 
    Args arg(argc, argv);
 
-   if (arg.Present("--version") || arg.Present("-v"))
+   if (  arg.Present("--version")
+      || arg.Present("-v"))
    {
       version_exit();
    }
@@ -555,7 +542,8 @@ int main(int argc, char *argv[])
    if (  ((parsed_file = arg.Param("--parsed")) != nullptr)
       || ((parsed_file = arg.Param("-p")) != nullptr))
    {
-      if (parsed_file[0] == '-' && !parsed_file[1])
+      if (  parsed_file[0] == '-'
+         && !parsed_file[1])
       {
          LOG_FMT(LNOTE, "Will print parsed data to stdout\n");
       }
@@ -566,7 +554,8 @@ int main(int argc, char *argv[])
    }
 
    // Enable log severities
-   if (arg.Present("-s") || arg.Present("--show"))
+   if (  arg.Present("-s")
+      || arg.Present("--show"))
    {
       log_show_sev(true);
    }
@@ -584,10 +573,12 @@ int main(int argc, char *argv[])
    {
       add_keyword(p_arg, CT_TYPE);
    }
+   bool arg_l_is_set = false;
 
    // Check for a language override
    if ((p_arg = arg.Param("-l")) != nullptr)
    {
+      arg_l_is_set   = true;
       cpd.lang_flags = language_flags_from_name(p_arg);
 
       if (cpd.lang_flags == 0)
@@ -653,19 +644,23 @@ int main(int argc, char *argv[])
    // Grab the output override
    const char *output_file = arg.Param("-o");
 
+   // for debugging tracking
+   cpd.html_file = arg.Param("--tracking_space");
+
    LOG_FMT(LDATA, "%s\n", UNCRUSTIFY_VERSION);
    LOG_FMT(LDATA, "config_file = %s\n", cfg_file.c_str());
    LOG_FMT(LDATA, "output_file = %s\n", (output_file != NULL) ? output_file : "null");
    LOG_FMT(LDATA, "source_file = %s\n", (source_file != NULL) ? source_file : "null");
    LOG_FMT(LDATA, "source_list = %s\n", (source_list != NULL) ? source_list : "null");
+   LOG_FMT(LDATA, "tracking    = %s\n", (cpd.html_file != NULL) ? cpd.html_file : "null");
    LOG_FMT(LDATA, "prefix      = %s\n", (prefix != NULL) ? prefix : "null");
    LOG_FMT(LDATA, "suffix      = %s\n", (suffix != NULL) ? suffix : "null");
    LOG_FMT(LDATA, "assume      = %s\n", (assume != NULL) ? assume : "null");
-   LOG_FMT(LDATA, "replace     = %d\n", replace);
-   LOG_FMT(LDATA, "no_backup   = %d\n", no_backup);
-   LOG_FMT(LDATA, "detect      = %d\n", detect);
-   LOG_FMT(LDATA, "check       = %d\n", cpd.do_check);
-   LOG_FMT(LDATA, "if_changed  = %d\n", cpd.if_changed);
+   LOG_FMT(LDATA, "replace     = %s\n", replace ? "true" : "false");
+   LOG_FMT(LDATA, "no_backup   = %s\n", no_backup ? "true" : "false");
+   LOG_FMT(LDATA, "detect      = %s\n", detect ? "true" : "false");
+   LOG_FMT(LDATA, "check       = %s\n", cpd.do_check ? "true" : "false");
+   LOG_FMT(LDATA, "if_changed  = %s\n", cpd.if_changed ? "true" : "false");
 
    if (  cpd.do_check
       && (  output_file
@@ -687,13 +682,15 @@ int main(int argc, char *argv[])
    {
       if (replace)
       {
-         if (prefix != nullptr || suffix != nullptr)
+         if (  prefix != nullptr
+            || suffix != nullptr)
          {
             usage_error("Cannot use --replace with --prefix or --suffix");
             return(EX_NOINPUT);
          }
 
-         if (source_file != nullptr || output_file != nullptr)
+         if (  source_file != nullptr
+            || output_file != nullptr)
          {
             usage_error("Cannot use --replace with -f or -o");
             return(EX_NOINPUT);
@@ -701,7 +698,8 @@ int main(int argc, char *argv[])
       }
       else if (!no_backup)
       {
-         if (prefix == nullptr && suffix == nullptr)
+         if (  prefix == nullptr
+            && suffix == nullptr)
          {
             suffix = ".uncrustify";
          }
@@ -713,7 +711,8 @@ int main(int argc, char *argv[])
     * It is optional for "--universalindent", "--parsed" and "--detect", but
     * required for everything else.
     */
-   if (!cfg_file.empty() && cfg_file[0] != '-')
+   if (  !cfg_file.empty()
+      && cfg_file[0] != '-')
    {
       cpd.filename = cfg_file;
 
@@ -829,7 +828,8 @@ int main(int argc, char *argv[])
    {
       file_mem fm;
 
-      if (source_file == nullptr || source_list != nullptr)
+      if (  source_file == nullptr
+         || source_list != nullptr)
       {
          fprintf(stderr, "The --detect option requires a single input file\n");
          log_flush(true);
@@ -837,7 +837,8 @@ int main(int argc, char *argv[])
       }
 
       // Do some simple language detection based on the filename extension
-      if (!cpd.lang_forced || cpd.lang_flags == 0)
+      if (  !cpd.lang_forced
+         || cpd.lang_flags == 0)
       {
          cpd.lang_flags = language_flags_from_filename(source_file);
       }
@@ -861,7 +862,8 @@ int main(int argc, char *argv[])
       return(EXIT_SUCCESS);
    }
 
-   if (update_config || update_config_wd)
+   if (  update_config
+      || update_config_wd)
    {
       // TODO: complain if file-processing related options are present
       if (auto error = redir_stdout(output_file))
@@ -876,7 +878,8 @@ int main(int argc, char *argv[])
     * Everything beyond this point aside from dumping the parse tree is silly
     * without a config file, so complain and bail if we don't have one.
     */
-   if (cfg_file.empty() && !parsed_file)
+   if (  cfg_file.empty()
+      && !parsed_file)
    {
       usage_error("Specify the config file with '-c file' or set UNCRUSTIFY_CONFIG");
       return(EX_IOERR);
@@ -888,7 +891,8 @@ int main(int argc, char *argv[])
    p_arg = arg.Unused(idx);
 
    // Check args - for multifile options
-   if (source_list != nullptr || p_arg != nullptr)
+   if (  source_list != nullptr
+      || p_arg != nullptr)
    {
       if (source_file != nullptr)
       {
@@ -905,16 +909,27 @@ int main(int argc, char *argv[])
    // This relies on cpd.filename being the config file name
    load_header_files();
 
-   if (cpd.do_check || cpd.if_changed)
+   if (  cpd.do_check
+      || cpd.if_changed)
    {
       cpd.bout = new deque<UINT8>();
    }
+   idx = 1;
 
    if (  source_file == nullptr
       && source_list == nullptr
-      && p_arg == nullptr)
+      && arg.Unused(idx) == nullptr)
    {
-      // no input specified, so use stdin
+      if (!arg_l_is_set)                     // Issue #3064
+      {
+         if (assume == nullptr)
+         {
+            LOG_FMT(LERR, "If reading from stdin, you should specify the language using -l\n");
+            LOG_FMT(LERR, "or specify a filename using --assume for automatic language detection.\n");
+            return(EXIT_FAILURE);
+         }
+      }
+
       if (cpd.lang_flags == 0)
       {
          if (assume != nullptr)
@@ -998,7 +1013,8 @@ int main(int argc, char *argv[])
       return(EXIT_FAILURE);
    }
 
-   if (cpd.do_check && cpd.check_fail_cnt != 0)
+   if (  cpd.do_check
+      && cpd.check_fail_cnt != 0)
    {
       return(EXIT_FAILURE);
    }
@@ -1010,7 +1026,7 @@ static void process_source_list(const char *source_list,
                                 const char *prefix, const char *suffix,
                                 bool no_backup, bool keep_mtime)
 {
-   int  from_stdin = strcmp(source_list, "-") == 0;
+   bool from_stdin = strcmp(source_list, "-") == 0;
    FILE *p_file    = from_stdin ? stdin : fopen(source_list, "r");
 
    if (p_file == nullptr)
@@ -1029,13 +1045,15 @@ static void process_source_list(const char *source_list,
       char *fname = linebuf;
       int  len    = strlen(fname);
 
-      while (len > 0 && unc_isspace(*fname))
+      while (  len > 0
+            && unc_isspace(*fname))
       {
          fname++;
          len--;
       }
 
-      while (len > 0 && unc_isspace(fname[len - 1]))
+      while (  len > 0
+            && unc_isspace(fname[len - 1]))
       {
          len--;
       }
@@ -1104,13 +1122,15 @@ static void make_folders(const string &filename)
 
    for (int idx = 0; outname[idx] != 0; idx++)
    {
-      if ((outname[idx] == '/') || (outname[idx] == '\\'))
+      if (  (outname[idx] == '/')
+         || (outname[idx] == '\\'))
       {
          outname[idx] = PATH_SEP;
       }
 
       // search until end of subpath is found
-      if (idx > last_idx && (outname[idx] == PATH_SEP))
+      if (  idx > last_idx
+         && (outname[idx] == PATH_SEP))
       {
          outname[idx] = 0; // mark the end of the subpath
 
@@ -1118,12 +1138,15 @@ static void make_folders(const string &filename)
          // and not a Windows drive letter
          if (  (strcmp(&outname[last_idx], ".") != 0)
             && (strcmp(&outname[last_idx], "..") != 0)
-            && (!(last_idx == 0 && idx == 2 && outname[1] == ':')))
+            && (!(  last_idx == 0
+                 && idx == 2
+                 && outname[1] == ':')))
          {
             int status;    // Coverity CID 75999
             status = mkdir(outname, 0750);
 
-            if (status != 0 && errno != EEXIST)
+            if (  status != 0
+               && errno != EEXIST)
             {
                LOG_FMT(LERR, "%s: Unable to create %s: %s (%d)\n",
                        __func__, outname, strerror(errno), errno);
@@ -1273,6 +1296,13 @@ int load_header_files()
       retval |= load_mem_file_config(options::cmt_insert_oc_msg_header(),
                                      cpd.oc_msg_hdr);
    }
+   log_rule_B("cmt_reflow_fold_regex_file");
+
+   if (!options::cmt_reflow_fold_regex_file().empty())
+   {
+      retval |= load_mem_file_config(options::cmt_reflow_fold_regex_file(),
+                                     cpd.reflow_fold_regex);
+   }
    return(retval);
 } // load_header_files
 
@@ -1326,7 +1356,8 @@ static bool file_content_matches(const string &filename1, const string &filename
    memset(buf1, 0, sizeof(buf1));
    memset(buf2, 0, sizeof(buf2));
 
-   while (len1 >= 0 && len2 >= 0)
+   while (  len1 >= 0
+         && len2 >= 0)
    {
       if (len1 == 0)
       {
@@ -1338,7 +1369,8 @@ static bool file_content_matches(const string &filename1, const string &filename
          len2 = read(fd2, buf2, sizeof(buf2));
       }
 
-      if (len1 <= 0 || len2 <= 0)
+      if (  len1 <= 0
+         || len2 <= 0)
       {
          break; // reached end of either files
          // TODO: what is if one file is longer than the other, do we miss that ?
@@ -1355,7 +1387,8 @@ static bool file_content_matches(const string &filename1, const string &filename
    close(fd1);
    close(fd2);
 
-   return(len1 == 0 && len2 == 0);
+   return(  len1 == 0
+         && len2 == 0);
 } // file_content_matches
 
 
@@ -1411,13 +1444,14 @@ static bool bout_content_matches(const file_mem &fm, bool report_status)
       }
    }
 
-   if (is_same && report_status)
+   if (  is_same
+      && report_status)
    {
       fprintf(stdout, "PASS: %s (%u bytes)\n",
               cpd.filename.c_str(), static_cast<int>(fm.raw.size()));
    }
    return(is_same);
-}
+} // bout_content_matches
 
 
 static void do_source_file(const char *filename_in,
@@ -1433,7 +1467,8 @@ static void do_source_file(const char *filename_in,
    string   filename_tmp;
 
    // Do some simple language detection based on the filename extension
-   if (!cpd.lang_forced || cpd.lang_flags == 0)
+   if (  !cpd.lang_forced
+      || cpd.lang_flags == 0)
    {
       cpd.lang_flags = language_flags_from_filename(filename_in);
    }
@@ -1543,7 +1578,8 @@ static void do_source_file(const char *filename_in,
       if (filename_tmp != filename_out)
       {
          // We need to compare and then do a rename (but avoid redundant test when if_changed set)
-         if (!cpd.if_changed && file_content_matches(filename_tmp, filename_out))
+         if (  !cpd.if_changed
+            && file_content_matches(filename_tmp, filename_out))
          {
             // No change - remove tmp file
             UNUSED(unlink(filename_tmp.c_str()));
@@ -1596,13 +1632,15 @@ static void add_file_footer()
    chunk_t *pc = chunk_get_tail();
 
    // Back up if the file ends with a newline
-   if (pc != nullptr && chunk_is_newline(pc))
+   if (  pc != nullptr
+      && chunk_is_newline(pc))
    {
       pc = chunk_get_prev(pc);
    }
 
    if (  pc != nullptr
-      && (!chunk_is_comment(pc) || !chunk_is_newline(chunk_get_prev(pc))))
+      && (  !chunk_is_comment(pc)
+         || !chunk_is_newline(chunk_get_prev(pc))))
    {
       pc = chunk_get_tail();
 
@@ -1623,7 +1661,7 @@ static void add_func_header(c_token_t type, file_mem &fm)
    chunk_t *tmp;
    bool    do_insert;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnlnp(pc))
+   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnlnp(pc))
    {
       if (pc->type != type)
       {
@@ -1651,7 +1689,8 @@ static void add_func_header(c_token_t type, file_mem &fm)
          {
             ref = ref->next;
 
-            if (chunk_is_token(ref, CT_SEMICOLON) && ref->level == pc->level)
+            if (  chunk_is_token(ref, CT_SEMICOLON)
+               && ref->level == pc->level)
             {
                continue;
             }
@@ -1666,7 +1705,8 @@ static void add_func_header(c_token_t type, file_mem &fm)
       {
          int found_brace = 0;                                 // Set if a close brace is found before a newline
 
-         while (ref->type != CT_NEWLINE && (ref = ref->next)) // TODO: is the assignment of ref wanted here?, better move it to the loop
+         while (  ref->type != CT_NEWLINE
+               && (ref = ref->next)) // TODO: is the assignment of ref wanted here?, better move it to the loop
          {
             if (chunk_is_token(ref, CT_BRACE_CLOSE))
             {
@@ -1691,7 +1731,8 @@ static void add_func_header(c_token_t type, file_mem &fm)
       while ((ref = chunk_get_prev(ref)) != nullptr)
       {
          // Bail if we change level or find an access specifier colon
-         if (ref->level != pc->level || chunk_is_token(ref, CT_ACCESS_COLON))
+         if (  ref->level != pc->level
+            || chunk_is_token(ref, CT_ACCESS_COLON))
          {
             do_insert = true;
             break;
@@ -1709,7 +1750,8 @@ static void add_func_header(c_token_t type, file_mem &fm)
          {
             tmp = chunk_get_prev_type(ref, CT_PREPROC, ref->level);
 
-            if (tmp != nullptr && get_chunk_parent_type(tmp) == CT_PP_IF)
+            if (  tmp != nullptr
+               && get_chunk_parent_type(tmp) == CT_PP_IF)
             {
                tmp = chunk_get_prev_nnl(tmp);
 
@@ -1724,7 +1766,8 @@ static void add_func_header(c_token_t type, file_mem &fm)
          }
 
          // Ignore 'right' comments
-         if (chunk_is_comment(ref) && chunk_is_newline(chunk_get_prev(ref)))
+         if (  chunk_is_comment(ref)
+            && chunk_is_newline(chunk_get_prev(ref)))
          {
             break;
          }
@@ -1739,10 +1782,21 @@ static void add_func_header(c_token_t type, file_mem &fm)
          }
       }
 
-      if (do_insert)
+      if (  ref == nullptr
+         && !chunk_is_comment(chunk_get_head())
+         && get_chunk_parent_type(chunk_get_head()) == type)
+      {
+         /**
+          * In addition to testing for preceding semicolons, closing braces, etc.,
+          * we need to also account for the possibility that the function declaration
+          * or definition occurs at the very beginning of the file
+          */
+         tokenize(fm.data, chunk_get_head());
+      }
+      else if (do_insert)
       {
          // Insert between after and ref
-         chunk_t *after = chunk_get_next_ncnl(ref);
+         chunk_t *after = chunk_get_next_ncnnl(ref);
          tokenize(fm.data, after);
 
          for (tmp = chunk_get_next(ref); tmp != after; tmp = chunk_get_next(tmp))
@@ -1761,7 +1815,7 @@ static void add_msg_header(c_token_t type, file_mem &fm)
    chunk_t *tmp;
    bool    do_insert;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnlnp(pc))
+   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnlnp(pc))
    {
       if (pc->type != type)
       {
@@ -1779,7 +1833,8 @@ static void add_msg_header(c_token_t type, file_mem &fm)
       {
          // ignore the CT_TYPE token that is the result type
          if (  ref->level != pc->level
-            && (chunk_is_token(ref, CT_TYPE) || chunk_is_token(ref, CT_PTR_TYPE)))
+            && (  chunk_is_token(ref, CT_TYPE)
+               || chunk_is_token(ref, CT_PTR_TYPE)))
          {
             continue;
          }
@@ -1796,7 +1851,8 @@ static void add_msg_header(c_token_t type, file_mem &fm)
          {
             tmp = chunk_get_prev_type(ref, CT_PREPROC, ref->level);
 
-            if (tmp != nullptr && get_chunk_parent_type(tmp) == CT_PP_IF)
+            if (  tmp != nullptr
+               && get_chunk_parent_type(tmp) == CT_PP_IF)
             {
                tmp = chunk_get_prev_nnl(tmp);
 
@@ -1811,14 +1867,16 @@ static void add_msg_header(c_token_t type, file_mem &fm)
          }
 
          if (  ref->level == pc->level
-            && (ref->flags.test(PCF_IN_PREPROC) || chunk_is_token(ref, CT_OC_SCOPE)))
+            && (  ref->flags.test(PCF_IN_PREPROC)
+               || chunk_is_token(ref, CT_OC_SCOPE)))
          {
             ref = chunk_get_prev(ref);
 
             if (ref != nullptr)
             {
                // Ignore 'right' comments
-               if (chunk_is_newline(ref) && chunk_is_comment(chunk_get_prev(ref)))
+               if (  chunk_is_newline(ref)
+                  && chunk_is_comment(chunk_get_prev(ref)))
                {
                   break;
                }
@@ -1831,7 +1889,7 @@ static void add_msg_header(c_token_t type, file_mem &fm)
       if (do_insert)
       {
          // Insert between after and ref
-         chunk_t *after = chunk_get_next_ncnl(ref);
+         chunk_t *after = chunk_get_next_ncnnl(ref);
          tokenize(fm.data, after);
 
          for (tmp = chunk_get_next(ref); tmp != after; tmp = chunk_get_next(tmp))
@@ -1916,7 +1974,8 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
    log_rule_B("utf8_byte");
 
    if (  options::utf8_force()
-      || ((cpd.enc == char_encoding_e::e_BYTE) && options::utf8_byte()))
+      || (  (cpd.enc == char_encoding_e::e_BYTE)
+         && options::utf8_byte()))
    {
       cpd.enc = char_encoding_e::e_UTF8;
    }
@@ -2002,6 +2061,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
       {
          add_msg_header(CT_OC_MSG_DECL, cpd.oc_msg_hdr);
       }
+      do_parent_for_pp();
       do_braces();  // Change virtual braces into real braces...
 
       // Scrub extra semicolons
@@ -2081,7 +2141,8 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
          log_rule_B("pos_comma");
          log_rule_B("pos_enum_comma");
 
-         if (options::pos_comma() != TP_IGNORE || options::pos_enum_comma() != TP_IGNORE)
+         if (  options::pos_comma() != TP_IGNORE
+            || options::pos_enum_comma() != TP_IGNORE)
          {
             newlines_chunk_pos(CT_COMMA, options::pos_comma());
          }
@@ -2124,7 +2185,8 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
          newlines_functions_remove_extra_blank_lines();
          newlines_cleanup_dup();
          first = false;
-      } while (old_changes != cpd.changes && cpd.pass_count-- > 0);
+      } while (  old_changes != cpd.changes
+              && cpd.pass_count-- > 0);
 
       mark_comments();
 
@@ -2138,7 +2200,8 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
       // Scrub certain added semicolons
       log_rule_B("mod_pawn_semicolon");
 
-      if (language_is_set(LANG_PAWN) && options::mod_pawn_semicolon())
+      if (  language_is_set(LANG_PAWN)
+         && options::mod_pawn_semicolon())
       {
          pawn_scrub_vsemi();
       }
@@ -2210,7 +2273,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
             {
                if (cpd.changes > options::debug_max_number_of_loops())                 // Issue #2432
                {
-                  LOG_FMT(LNEWLINE, "%s(%d): too many loop. Make a report, please.\n",
+                  LOG_FMT(LNEWLINE, "%s(%d): too many loops. Make a report, please.\n",
                           __func__, __LINE__);
                   log_flush(true);
                   exit(EX_SOFTWARE);
@@ -2218,11 +2281,14 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
             }
             do_code_width();
 
-            if (old_changes != cpd.changes && first)
+            if (  old_changes != cpd.changes
+               && first)
             {
                // retry line breaks caused by splitting 1-liners
                newlines_cleanup_braces(false);
                newlines_insert_blank_lines();
+               newlines_functions_remove_extra_blank_lines();
+               newlines_remove_disallowed();
                first = false;
             }
          }
@@ -2237,8 +2303,22 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
       {
          align_backslash_newline();
       }
-      // Now render it all to the output file
-      output_text(pfout);
+      // which output is to be done?
+
+      if (cpd.html_file == nullptr)
+      {
+         // Now render it all to the output file
+         output_text(pfout);
+      }
+      else
+      {
+         // create the tracking file
+         FILE *t_file;
+         t_file = fopen(cpd.html_file, "wb");
+         output_text(t_file);
+         fclose(t_file);
+         exit(EX_OK);
+      }
    }
 
    // Special hook for dumping parsed data for debugging
@@ -2246,7 +2326,8 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
    {
       FILE *p_file;
 
-      if (parsed_file[0] == '-' && !parsed_file[1])
+      if (  parsed_file[0] == '-'
+         && !parsed_file[1])
       {
          p_file = stdout;
       }
@@ -2279,7 +2360,8 @@ void uncrustify_file(const file_mem &fm, FILE *pfout,
       }
    }
 
-   if (cpd.do_check && !bout_content_matches(fm, true))
+   if (  cpd.do_check
+      && !bout_content_matches(fm, true))
    {
       cpd.check_fail_cnt++;
    }
@@ -2335,7 +2417,8 @@ const char *get_token_name(c_token_t token)
 
 c_token_t find_token_name(const char *text)
 {
-   if (text != nullptr && (*text != 0))
+   if (  text != nullptr
+      && (*text != 0))
    {
       for (int idx = 1; idx < static_cast<int> ARRAY_SIZE(token_names); idx++)
       {
@@ -2355,7 +2438,8 @@ static bool ends_with(const char *filename, const char *tag, bool case_sensitive
    int len2 = strlen(tag);
 
    return(  len2 <= len1
-         && (  (case_sensitive && (strcmp(&filename[len1 - len2], tag) == 0))
+         && (  (  case_sensitive
+               && (strcmp(&filename[len1 - len2], tag) == 0))
             || (  !case_sensitive
                && (strcasecmp(&filename[len1 - len2], tag) == 0))));
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.h
index e95b593d..d193a264 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify.h
@@ -9,9 +9,6 @@
 #ifndef UNCRUSTIFY_H_INCLUDED
 #define UNCRUSTIFY_H_INCLUDED
 
-#include "base_types.h"
-#include "log_levels.h"
-#include "token_enum.h"
 #include "uncrustify_types.h"
 
 #include <stdio.h>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_emscripten.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_emscripten.cpp
index e68c757a..d7b89081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_emscripten.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_emscripten.cpp
@@ -677,10 +677,10 @@ EMSCRIPTEN_BINDINGS(MainModule)
       .value("STRING", option_type_e::STRING);
 
    enum_<iarf_e>("IARF")
-      .value("IGNORE", iarf_e::IGNORE)
-      .value("ADD", iarf_e::ADD)
-      .value("REMOVE", iarf_e::REMOVE)
-      .value("FORCE", iarf_e::FORCE);
+      .value("IGNORE", IARF_IGNORE)
+      .value("ADD", IARF_ADD)
+      .value("REMOVE", IARF_REMOVE)
+      .value("FORCE", IARF_FORCE);
 
    enum_<line_end_e>("LineEnd")
       .value("LF", line_end_e::LF)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_limits.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_limits.h
index 098f8a9c..a03591e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_limits.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_limits.h
@@ -1,4 +1,5 @@
 #pragma once
+
 namespace uncrustify
 {
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_types.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.cpp
index bd57f2d5..bd57f2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_types.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.h
index ee05c1c2..1aeb43c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_types.h
@@ -10,11 +10,6 @@
 #ifndef UNCRUSTIFY_TYPES_H_INCLUDED
 #define UNCRUSTIFY_TYPES_H_INCLUDED
 
-#include "base_types.h"
-#include "enum_flags.h"
-#include "log_levels.h"
-#include "logger.h"
-#include "option_enum.h"
 #include "options.h"
 #include "pcf_flags.h"
 #include "token_enum.h"    // c_token_t
@@ -22,9 +17,6 @@
 #include "uncrustify_limits.h"
 
 #include <assert.h>
-#include <cstdio>
-#include <deque>
-#include <vector>
 
 #ifdef HAVE_UTIME_H
 #include <utime.h>
@@ -129,6 +121,10 @@ struct align_ptr_t
 };
 
 
+// for debugging purpose only
+typedef std::pair<size_t, char *>   Track_nr;         // track for "trackNumber" and "rule"
+typedef std::vector<Track_nr>       track_list;       // liste for many tracks
+
 // This is the main type of this program
 struct chunk_t
 {
@@ -159,8 +155,10 @@ struct chunk_t
       nl_column     = 0;
       level         = 0;
       brace_level   = 0;
-      pp_level      = 0;
+      pp_level      = 999;                           // use a big value to find some errors
       after_tab     = false;
+      // for debugging purpose only
+      tracking = nullptr;
       str.clear();
    }
 
@@ -178,6 +176,43 @@ struct chunk_t
       return(str.c_str());
    }
 
+
+   // Issue #2984, fill up, if necessary, a copie of the first chars of the text() string
+   const char *elided_text(char *for_the_copy)
+   {
+      const char *test_it       = text();
+      size_t     test_it_length = strlen(test_it);
+
+      size_t     truncate_value = uncrustify::options::debug_truncate();
+
+      if (truncate_value != 0)
+      {
+         if (test_it_length > truncate_value)
+         {
+            memset(for_the_copy, 0, 1000);
+
+            if (test_it_length < truncate_value + 30)
+            {
+               strncpy(for_the_copy, test_it, truncate_value - 30);
+               for_the_copy[truncate_value - 30] = 0;
+            }
+            else
+            {
+               strncpy(for_the_copy, test_it, truncate_value);
+               for_the_copy[truncate_value] = 0;
+            }
+            char *message = strcat(for_the_copy, " ... <The string is truncated>");
+
+            return(message);
+         }
+         else
+         {
+            return(test_it);
+         }
+      }
+      return(test_it);
+   }
+
    chunk_t      *next;            //! pointer to next chunk in list
    chunk_t      *prev;            //! pointer to previous chunk in list
    chunk_t      *parent;          //! pointer to parent chunk(not always set)
@@ -197,11 +232,15 @@ struct chunk_t
                                    * column used to indent with tabs          */
    size_t       nl_count;         //! number of newlines in CT_NEWLINE
    size_t       nl_column;        //! column of the subsequent newline entries(all of them should have the same column)
-   size_t       level;            //! nest level in {, (, or [
+   size_t       level;            /** nest level in {, (, or [
+                                   * only to help vim command } */
    size_t       brace_level;      //! nest level in braces only
    size_t       pp_level;         //! nest level in preprocessor
    bool         after_tab;        //! whether this token was after a tab
    unc_text     str;              //! the token text
+
+   // for debugging purpose only
+   track_list   *tracking;
 };
 
 
@@ -308,6 +347,7 @@ struct cp_data_t
    file_mem          func_hdr;          // for cmt_insert_func_header
    file_mem          oc_msg_hdr;        // for cmt_insert_oc_msg_header
    file_mem          class_hdr;         // for cmt_insert_class_header
+   file_mem          reflow_fold_regex; // for cmt_reflow_fold_regex_file
 
    size_t            lang_flags;        //! defines the language of the source input
    bool              lang_forced;       //! overwrites automatic language detection
@@ -350,6 +390,7 @@ struct cp_data_t
 
    const char        *phase_name;
    const char        *dumped_file;
+   const char        *html_file = nullptr; // for debugging purpose only
 };
 
 extern cp_data_t cpd;  // TODO: can we avoid this external variable?
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_version.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_version.h.in
index 079e0fa6..079e0fa6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/uncrustify_version.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/uncrustify_version.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unicode.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.cpp
index 117d7bcc..172cda28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unicode.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.cpp
@@ -8,14 +8,6 @@
 
 #include "unicode.h"
 
-#include "prototypes.h"
-#include "unc_ctype.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
-
-#include <cstdlib>
-#include <cstring>
-
 
 using namespace std;
 
@@ -218,7 +210,8 @@ static bool decode_utf8(const vector<UINT8> &in_data, deque<int> &out_data)
          return(false);
       }
 
-      while (cnt-- > 0 && idx < in_data.size())
+      while (  cnt-- > 0
+            && idx < in_data.size())
       {
          int tmp = in_data[idx++];
 
@@ -279,11 +272,13 @@ static bool decode_utf16(const vector<UINT8> &in_data, deque<int> &out_data, cha
    }
    size_t idx = 2;
 
-   if ((in_data[0] == 0xfe) && (in_data[1] == 0xff))
+   if (  (in_data[0] == 0xfe)
+      && (in_data[1] == 0xff))
    {
       enc = char_encoding_e::e_UTF16_BE;
    }
-   else if ((in_data[0] == 0xff) && (in_data[1] == 0xfe))
+   else if (  (in_data[0] == 0xff)
+           && (in_data[1] == 0xfe))
    {
       enc = char_encoding_e::e_UTF16_LE;
    }
@@ -337,7 +332,8 @@ static bool decode_utf16(const vector<UINT8> &in_data, deque<int> &out_data, cha
          ch += 0x10000;
          out_data.push_back(ch);
       }
-      else if (  (ch >= 0 && ch < 0xD800)
+      else if (  (  ch >= 0
+                 && ch < 0xD800)
               || ch >= 0xE000)
       {
          out_data.push_back(ch);
@@ -358,13 +354,15 @@ static bool decode_bom(const vector<UINT8> &in_data, char_encoding_e &enc)
 
    if (in_data.size() >= 2)
    {
-      if ((in_data[0] == 0xfe) && (in_data[1] == 0xff))
+      if (  (in_data[0] == 0xfe)
+         && (in_data[1] == 0xff))
       {
          enc = char_encoding_e::e_UTF16_BE;
          return(true);
       }
 
-      if ((in_data[0] == 0xff) && (in_data[1] == 0xfe))
+      if (  (in_data[0] == 0xff)
+         && (in_data[1] == 0xfe))
       {
          enc = char_encoding_e::e_UTF16_LE;
          return(true);
@@ -469,8 +467,10 @@ static void write_utf8(int ch)
 static void write_utf16(int ch, bool be)
 {
    // U+0000 to U+D7FF and U+E000 to U+FFFF
-   if (  (ch >= 0 && ch < 0xD800)
-      || (ch >= 0xE000 && ch < 0x10000))
+   if (  (  ch >= 0
+         && ch < 0xD800)
+      || (  ch >= 0xE000
+         && ch < 0x10000))
    {
       if (be)
       {
@@ -483,7 +483,8 @@ static void write_utf16(int ch, bool be)
          write_byte(ch >> 8);
       }
    }
-   else if (ch >= 0x10000 && ch < 0x110000)
+   else if (  ch >= 0x10000
+           && ch < 0x110000)
    {
       int v1 = ch - 0x10000;
       int w1 = 0xD800 + (v1 >> 10);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unicode.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.h
index d9818022..e9cbd97c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/unicode.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/unicode.h
@@ -9,7 +9,6 @@
 #ifndef UNICODE_H_INCLUDED
 #define UNICODE_H_INCLUDED
 
-#include "unc_text.h"
 #include "uncrustify_types.h"
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/universalindentgui.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.cpp
index 239cae27..eff612be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/universalindentgui.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.cpp
@@ -16,10 +16,11 @@
 #include "uncrustify.h"
 #include "uncrustify_version.h"
 
+#include <cstdio>
 #include <vector>
 
-#include <cstdio>
 
+constexpr static auto LCURRENT = LOTHER;
 
 using namespace std;
 
@@ -201,7 +202,8 @@ void print_universal_indent_cfg(FILE *pfile)
 
          // Output the description which may contain forbidden chars, skipping
          // the last character which is always an extra newline
-         while (*tmp != 0 && *(tmp + 1) != 0)
+         while (  *tmp != 0
+               && *(tmp + 1) != 0)
          {
             switch (*tmp)
             {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/universalindentgui.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.h
index 35a65167..35a65167 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/universalindentgui.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/universalindentgui.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.cpp
index be704a5c..c5ed4b2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.cpp
@@ -8,16 +8,12 @@
 
 #include "width.h"
 
-#include "chunk_list.h"
-#include "error_types.h"
 #include "indent.h"
-#include "log_rules.h"
 #include "newlines.h"
 #include "prototypes.h"
-#include "uncrustify.h"
-#include "uncrustify_types.h"
 
-#include <cstdlib>
+
+constexpr static auto LCURRENT = LSPLIT;
 
 using namespace uncrustify;
 
@@ -145,7 +141,8 @@ static void split_before_chunk(chunk_t *pc)
    LOG_FUNC_ENTRY();
    LOG_FMT(LSPLIT, "%s(%d): text() '%s'\n", __func__, __LINE__, pc->text());
 
-   if (!chunk_is_newline(pc) && !chunk_is_newline(chunk_get_prev(pc)))
+   if (  !chunk_is_newline(pc)
+      && !chunk_is_newline(chunk_get_prev(pc)))
    {
       newline_add_before(pc);
       // reindent needs to include the indent_continue value and was off by one
@@ -252,7 +249,8 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    chunk_t *prev = chunk_get_prev(pc);
 
    if (  prev == nullptr
-      || (chunk_is_newline(prev) && chunk_is_not_token(pc, CT_STRING)))
+      || (  chunk_is_newline(prev)
+         && chunk_is_not_token(pc, CT_STRING)))
    {
       if (prev != nullptr)
       {
@@ -292,7 +290,8 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    // keep common groupings unless ls_code_width
    log_rule_B("ls_code_width");
 
-   if (!options::ls_code_width() && pc_pri >= 20)
+   if (  !options::ls_code_width()
+      && pc_pri >= 20)
    {
       LOG_FMT(LSPLIT, "%s(%d): keep common groupings unless ls_code_width, return\n", __func__, __LINE__);
       return;
@@ -304,7 +303,8 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    {
       chunk_t *next = chunk_get_next(pc);
 
-      if (chunk_is_not_token(next, CT_WORD) && (get_split_pri(next->type) != 25))
+      if (  chunk_is_not_token(next, CT_WORD)
+         && (get_split_pri(next->type) != 25))
       {
          LOG_FMT(LSPLIT, "%s(%d): don't break after last term of a qualified type, return\n", __func__, __LINE__);
          return;
@@ -314,14 +314,16 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    // Check levels first
    bool change = false;
 
-   if (ent.pc == nullptr || pc->level < ent.pc->level)
+   if (  ent.pc == nullptr
+      || pc->level < ent.pc->level)
    {
       LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
       change = true;
    }
    else
    {
-      if (pc->level >= ent.pc->level && pc_pri < ent.pri)
+      if (  pc->level >= ent.pc->level
+         && pc_pri < ent.pri)
       {
          LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
          change = true;
@@ -424,7 +426,8 @@ static bool split_line(chunk_t *start)
    chunk_t *pc = start;
    chunk_t *prev;
 
-   while (((pc = chunk_get_prev(pc)) != nullptr) && !chunk_is_newline(pc))
+   while (  ((pc = chunk_get_prev(pc)) != nullptr)
+         && !chunk_is_newline(pc))
    {
       LOG_FMT(LSPLIT, "%s(%d): at %s, orig_line is %zu, orig_col is %zu\n",
               __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
@@ -436,7 +439,8 @@ static bool split_line(chunk_t *start)
          // break at maximum line length
          log_rule_B("ls_code_width");
 
-         if (ent.pc != nullptr && (options::ls_code_width()))
+         if (  ent.pc != nullptr
+            && (options::ls_code_width()))
          {
             break;
          }
@@ -589,7 +593,8 @@ static void split_for_stmt(chunk_t *start)
 
    pc = start;
 
-   if (chunk_is_token(pc, CT_SEMICOLON) && get_chunk_parent_type(pc) == CT_FOR)
+   if (  chunk_is_token(pc, CT_SEMICOLON)
+      && get_chunk_parent_type(pc) == CT_FOR)
    {
       st[count++] = pc;
    }
@@ -599,7 +604,8 @@ static void split_for_stmt(chunk_t *start)
          && ((pc = chunk_get_prev(pc)) != nullptr)
          && pc->flags.test(PCF_IN_SPAREN))
    {
-      if (chunk_is_token(pc, CT_SEMICOLON) && get_chunk_parent_type(pc) == CT_FOR)
+      if (  chunk_is_token(pc, CT_SEMICOLON)
+         && get_chunk_parent_type(pc) == CT_FOR)
       {
          st[count++] = pc;
       }
@@ -611,7 +617,8 @@ static void split_for_stmt(chunk_t *start)
          && ((pc = chunk_get_next(pc)) != nullptr)
          && pc->flags.test(PCF_IN_SPAREN))
    {
-      if (chunk_is_token(pc, CT_SEMICOLON) && get_chunk_parent_type(pc) == CT_FOR)
+      if (  chunk_is_token(pc, CT_SEMICOLON)
+         && get_chunk_parent_type(pc) == CT_FOR)
       {
          st[count++] = pc;
       }
@@ -624,7 +631,8 @@ static void split_for_stmt(chunk_t *start)
       split_before_chunk(chunk_get_next(st[count]));
    }
 
-   if (!is_past_width(start) || nl_cnt > 0)
+   if (  !is_past_width(start)
+      || nl_cnt > 0)
    {
       return;
    }
@@ -633,7 +641,8 @@ static void split_for_stmt(chunk_t *start)
 
    while ((pc = chunk_get_next(pc)) != start)
    {
-      if (chunk_is_token(pc, CT_COMMA) && (pc->level == (open_paren->level + 1)))
+      if (  chunk_is_token(pc, CT_COMMA)
+         && (pc->level == (open_paren->level + 1)))
       {
          split_before_chunk(chunk_get_next(pc));
 
@@ -648,7 +657,8 @@ static void split_for_stmt(chunk_t *start)
 
    while ((pc = chunk_get_next(pc)) != start)
    {
-      if (chunk_is_token(pc, CT_ASSIGN) && (pc->level == (open_paren->level + 1)))
+      if (  chunk_is_token(pc, CT_ASSIGN)
+         && (pc->level == (open_paren->level + 1)))
       {
          split_before_chunk(chunk_get_next(pc));
 
@@ -677,7 +687,8 @@ static void split_fcn_params_full(chunk_t *start)
       LOG_FMT(LSPLIT, "%s(%d): %s, orig_col is %zu, level is %zu\n",
               __func__, __LINE__, fpo->text(), fpo->orig_col, fpo->level);
 
-      if (chunk_is_token(fpo, CT_FPAREN_OPEN) && (fpo->level == start->level - 1))
+      if (  chunk_is_token(fpo, CT_FPAREN_OPEN)
+         && (fpo->level == start->level - 1))
       {
          break;  // opening parenthesis found. Issue #1020
       }
@@ -685,14 +696,15 @@ static void split_fcn_params_full(chunk_t *start)
    // Now break after every comma
    chunk_t *pc = fpo;
 
-   while ((pc = chunk_get_next_ncnl(pc)) != nullptr)
+   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
    {
       if (pc->level <= fpo->level)
       {
          break;
       }
 
-      if ((pc->level == (fpo->level + 1)) && chunk_is_token(pc, CT_COMMA))
+      if (  (pc->level == (fpo->level + 1))
+         && chunk_is_token(pc, CT_COMMA))
       {
          split_before_chunk(chunk_get_next(pc));
       }
@@ -703,7 +715,8 @@ static void split_fcn_params_full(chunk_t *start)
 static void split_fcn_params(chunk_t *start)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): '%s'\n", __func__, __LINE__, start->text());
+   LOG_FMT(LSPLIT, "%s(%d): start->text() is '%s', orig_line is %zu, orig_col is %zu\n",
+           __func__, __LINE__, start->text(), start->orig_line, start->orig_col);
    chunk_t *fpo = start;
 
    if (!chunk_is_token(start, CT_FPAREN_OPEN))
@@ -719,7 +732,7 @@ static void split_fcn_params(chunk_t *start)
                  __func__, __LINE__, fpo->text(), fpo->orig_col, fpo->level);
       }
    }
-   chunk_t *pc     = chunk_get_next_ncnl(fpo);
+   chunk_t *pc     = chunk_get_next_ncnnl(fpo);
    size_t  min_col = pc->column;
 
    log_rule_B("code_width");
@@ -755,7 +768,8 @@ static void split_fcn_params(chunk_t *start)
          LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
                  __func__, __LINE__, last_col);
 
-         if (chunk_is_token(pc, CT_COMMA) || chunk_is_token(pc, CT_FPAREN_CLOSE))
+         if (  chunk_is_token(pc, CT_COMMA)
+            || chunk_is_token(pc, CT_FPAREN_CLOSE))
          {
             if (cur_width == 0)
             {
@@ -782,22 +796,26 @@ static void split_fcn_params(chunk_t *start)
    // back up until the prev is a comma
    chunk_t *prev = pc;
 
-   LOG_FMT(LSPLIT, "  %s(%d): back up until the prev is a comma\n", __func__, __LINE__);
+   LOG_FMT(LSPLIT, "%s(%d): back up until the prev is a comma, begin is '%s', level is %zu\n",
+           __func__, __LINE__, prev->text(), prev->level);
 
    while ((prev = chunk_get_prev(prev)) != nullptr)
    {
-      LOG_FMT(LSPLIT, "%s(%d): pc '%s', pc->level is %zu, prev '%s', prev->type is %s\n",
-              __func__, __LINE__, pc->text(), pc->level, prev->text(), get_token_name(prev->type));
+      LOG_FMT(LSPLIT, "%s(%d): prev->text() is '%s', prev->orig_line is %zu, prev->orig_col is %zu\n",
+              __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col);
+      LOG_FMT(LSPLIT, "%s(%d): prev->level is %zu, prev '%s', prev->type is %s\n",
+              __func__, __LINE__, prev->level, prev->text(), get_token_name(prev->type));
 
-      if (chunk_is_newline(prev) || chunk_is_token(prev, CT_COMMA))
+      if (  chunk_is_newline(prev)
+         || chunk_is_token(prev, CT_COMMA))
       {
          LOG_FMT(LSPLIT, "%s(%d): found at %zu\n",
                  __func__, __LINE__, prev->orig_col);
          break;
       }
-      LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
-              __func__, __LINE__, last_col);
-      last_col -= pc->len();
+      LOG_FMT(LSPLIT, "%s(%d): last_col is %d, prev->len() is %zu\n",
+              __func__, __LINE__, last_col, prev->len());
+      last_col -= prev->len();
       LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
               __func__, __LINE__, last_col);
 
@@ -837,7 +855,8 @@ static void split_fcn_params(chunk_t *start)
       }
    }
 
-   if (prev != nullptr && !chunk_is_newline(prev))
+   if (  prev != nullptr
+      && !chunk_is_newline(prev))
    {
       LOG_FMT(LSPLIT, "%s(%d): -- ended on %s --\n",
               __func__, __LINE__, get_token_name(prev->type));
@@ -864,13 +883,15 @@ static void split_template(chunk_t *start)
    {
       LOG_FMT(LSPLIT, "  %s(%d): prev '%s'\n", __func__, __LINE__, prev->text());
 
-      if (chunk_is_newline(prev) || chunk_is_token(prev, CT_COMMA))
+      if (  chunk_is_newline(prev)
+         || chunk_is_token(prev, CT_COMMA))
       {
          break;
       }
    }
 
-   if (prev != nullptr && !chunk_is_newline(prev))
+   if (  prev != nullptr
+      && !chunk_is_newline(prev))
    {
       LOG_FMT(LSPLIT, "  %s(%d):", __func__, __LINE__);
       LOG_FMT(LSPLIT, " -- ended on %s --\n", get_token_name(prev->type));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/width.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.h
index 3c5ad0b0..3c5ad0b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/width.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/width.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/windows_compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/windows_compat.h
index 8210adab..8210adab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/src/windows_compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/src/windows_compat.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/.editorconfig
index fcea945e..fcea945e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/.editorconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/CMakeLists.txt
index 1cdf0928..0dae0096 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/CMakeLists.txt
@@ -71,6 +71,7 @@ add_test(
   NAME cli_options
   COMMAND ${PYTHON_EXECUTABLE}
     test_cli_options.py
+    --config $<CONFIG>
     --build ${uncrustify_BINARY_DIR}
     --diff
   ${_configs}
@@ -80,6 +81,7 @@ add_test(
 add_custom_target(update-cli-options
   COMMAND ${PYTHON_EXECUTABLE}
     test_cli_options.py
+    --config $<CONFIG>
     --build ${uncrustify_BINARY_DIR}
     --apply
   DEPENDS uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/c-sharp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c-sharp.test
index 13706e2f..13706e2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/c-sharp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c-sharp.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c.test
index 7b71c2f1..50d24735 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/c.test
@@ -80,6 +80,7 @@
 00120  sp_cmt_cpp_start-r.cfg               c/sp_cmt_cpp_start.c
 00121  sp_cmt_cpp_start-a.cfg               c/sp_cmt_cpp_start.c
 00122  sp_cmt_cpp_start_force.cfg           c/sp_cmt_cpp_start.c
+00123  cmt_reflow.cfg                       c/cmt_reflow.c
 
 00130  ben_070.cfg                          c/minus-minus.c
 00135  nepenthes.cfg                        c/br_cmt.c
@@ -205,6 +206,7 @@
 
 00631  nl_assign1.cfg                       c/nl_assign.c
 00632  nl_assign2.cfg                       c/nl_assign.c
+00633  nl_assign1.cfg                       c/bug_3156.c
 
 # function def newlines
 00701  func-def-1.cfg                       c/function-def.c
@@ -296,6 +298,7 @@
 02320  nl_create_one_liner.cfg              c/nl_create_one_liner.c
 02325  sort_imports.cfg                     c/sort_include.c
 
+02330  leave_one_liners.cfg                 c/one_liners.c
 
 # some embedded sql stuff
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/I-842.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/I-842.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/I-842.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/I-842.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/mini_d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_d.cfg
index ddd51138..ddd51138 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/mini_d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_d.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/mini_nd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_nd.cfg
index 23db4460..23db4460 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/mini_nd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/mini_nd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/replace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/replace.cfg
index 16473bf2..16473bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/replace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/replace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/tracking_space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/tracking_space.cfg
new file mode 100644
index 00000000..8b37aa38
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/tracking_space.cfg
@@ -0,0 +1,4 @@
+indent_with_tabs = 0
+indent_columns   = 3
+sp_arith         = force
+sp_assign        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/truncate.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/truncate.cfg
new file mode 100644
index 00000000..cc48c57e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/truncate.cfg
@@ -0,0 +1 @@
+debug_truncate = 38
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/unmatched_close_pp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/unmatched_close_pp.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/config/unmatched_close_pp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/config/unmatched_close_pp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/I-842.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/I-842.cpp
index 7f7bcaf3..7f7bcaf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/I-842.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/I-842.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/backup.h-save b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/backup.h-save
index 9a66578c..9a66578c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/backup.h-save
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/backup.h-save
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/class_enum_struct_union.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/class_enum_struct_union.cpp
index 9041745d..6a72c823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/class_enum_struct_union.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/class_enum_struct_union.cpp
@@ -86,7 +86,7 @@ public:
 } c31, *c32 = nullptr, *c33[] = { nullptr, nullptr }, c34{ 0, 1, 2}, * const c35(nullptr), c16(0, 1, 2);
 
 // class/struct [macros/attributes ...] type x, ...
-class __attribute__((__deprecated__)) API_EXPORT ALIGNAS(4) c3 c41, *c42 = nullptr, *c43[] = { nullptr, nullptr }, c44{ 0, 1, 2}, * const c45(nullptr), c46(0, 1, 2);
+class __attribute__((__deprecated__)) API_EXPORT ALIGNAS(4) c3 c41, *c42 = c32 ? c32 : nullptr, *c43[] = { nullptr, nullptr }, c44{ 0, 1, 2}, * const c45(nullptr), c46(0, 1, 2);
 
 // class/struct [macros/attributes ...] type : bases ... { } x, ...
 class ALIGNAS(4) API_EXPORT __attribute__((__deprecated__))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/replace.list b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/replace.list
index 8de0b2c8..8de0b2c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/replace.list
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/replace.list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/testSrc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrc.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/testSrc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/testSrcP.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrcP.cpp
index 85e36674..85e36674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/testSrcP.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/testSrcP.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/tracking_space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/tracking_space.cpp
new file mode 100644
index 00000000..5b0b8aa1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/tracking_space.cpp
@@ -0,0 +1,11 @@
+{
+   a =     b +              111-55;
+}
+template<typename...A, int...B>
+struct foo1:foo1<A..., (sizeof...(A)+B)...>
+{
+        foo1() {
+                int x = sizeof...(A);
+                bool b = x > 1;
+        }
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/truncate.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/truncate.cpp
new file mode 100644
index 00000000..7ef9530d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/truncate.cpp
@@ -0,0 +1,4 @@
+// 1 6789A123456789B123456789c123456789d123456789 123456789 123456789 123
+// 2 6789A123456789B123456789c123456789
+// 3 6789A123456789B123456789c12345678
+// 4 6789A123456789B123456789c1234567
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/unmatched_close_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/unmatched_close_pp.cpp
index b79d12fd..b79d12fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/input/unmatched_close_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/input/unmatched_close_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/21.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/21.txt
new file mode 100644
index 00000000..7c702d87
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/21.txt
@@ -0,0 +1,1887 @@
+log_rule(indent_text : rule is 'indent_columns'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 1, pc->column is 1, pc->text() is 'struct, indent_column is 1
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 1, indent set to 1, for 'struct'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_macro_brace'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 2, pc->column is 1, pc->text() is '{, indent_column is 1
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 2, indent set to 1, for '{'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 3, pc->column is 1, pc->text() is 'TelegramIndex, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_class_colon'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 4, pc->column is 1, pc->text() is 'pTelName, indent_column is 17
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 4, indent set to 17, for 'pTelName'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 5, pc->column is 1, pc->text() is 'nTelIndex, indent_column is 17
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_macro_brace'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 6, pc->column is 1, pc->text() is '{, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 6, indent set to 9, for '{'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 7, pc->column is 1, pc->text() is '}, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 7, indent set to 9, for '}'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 9, pc->column is 1, pc->text() is '~, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 9, indent set to 9, for '~'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_macro_brace'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 10, pc->column is 1, pc->text() is '{, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 10, indent set to 9, for '{'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 11, pc->column is 1, pc->text() is '}, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 11, indent set to 9, for '}'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 13, pc->column is 1, pc->text() is 'const, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 13, indent set to 9, for 'const'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 14, pc->column is 1, pc->text() is 'unsigned, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 14, indent set to 9, for 'unsigned'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(reindent_line : rule is 'indent_relative_single_line_comments'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 15, pc->column is 1, pc->text() is '}, indent_column is 1
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 15, indent set to 1, for '}'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_columns'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 1, pc->column is 1, pc->text() is 'struct, indent_column is 1
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 1, indent set to 1, for 'struct'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_macro_brace'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 2, pc->column is 1, pc->text() is '{, indent_column is 1
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 2, indent set to 1, for '{'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 3, pc->column is 9, pc->text() is 'TelegramIndex, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_class_colon'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 4, pc->column is 17, pc->text() is 'pTelName, indent_column is 17
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 4, indent set to 17, for 'pTelName'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 5, pc->column is 17, pc->text() is 'nTelIndex, indent_column is 17
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_macro_brace'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 6, pc->column is 9, pc->text() is '{, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 6, indent set to 9, for '{'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 7, pc->column is 9, pc->text() is '}, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 7, indent set to 9, for '}'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 9, pc->column is 9, pc->text() is '~, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 9, indent set to 9, for '~'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_align_paren'
+log_rule(indent_text : rule is 'indent_paren_nl'
+log_rule(indent_text : rule is 'indent_square_nl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'use_indent_continue_only_once'
+log_rule(indent_text : rule is 'indent_paren_after_func_decl'
+log_rule(indent_text : rule is 'indent_paren_after_func_def'
+log_rule(indent_text : rule is 'indent_paren_after_func_call'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_macro_brace'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 10, pc->column is 9, pc->text() is '{, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 10, indent set to 9, for '{'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 11, pc->column is 9, pc->text() is '}, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 11, indent set to 9, for '}'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 13, pc->column is 9, pc->text() is 'const, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 13, indent set to 9, for 'const'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 14, pc->column is 9, pc->text() is 'unsigned, indent_column is 9
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 14, indent set to 9, for 'unsigned'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_continue'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+indent_text : pc->line is 15, pc->column is 1, pc->text() is '}, indent_column is 1
+log_rule(indent_text : rule is 'pos_conditional'
+indent_text : orig_line is 15, indent set to 1, for '}'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(indent_text : rule is 'indent_col1_multi_string_literal'
+log_rule(indent_text : rule is 'use_options_overriding_for_qt_macros'
+log_rule(indent_text : rule is 'indent_brace_parent'
+log_rule(indent_text : rule is 'indent_func_def_force_col1'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_inside_ternary_operator'
+log_rule(indent_text : rule is 'indent_access_spec_body'
+log_rule(indent_text : rule is 'indent_oc_inside_msg_sel'
+log_rule(indent_text : rule is 'indent_single_newlines'
+log_rule(indent_text : rule is 'indent_braces'
+log_rule(indent_text : rule is 'indent_braces_no_func'
+log_rule(indent_text : rule is 'indent_braces_no_class'
+log_rule(indent_text : rule is 'indent_braces_no_struct'
+log_rule(indent_text : rule is 'indent_shift'
+log_rule(indent_text : rule is 'indent_xml_string'
+log_rule(indent_text : rule is 'indent_continue_class_head'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
+log_rule(next_tab_column : rule is 'output_tab_size'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/25.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/25.txt
new file mode 100644
index 00000000..12967a1b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/25.txt
@@ -0,0 +1,237 @@
+Newline loop start: 0
+log_rule(newlines_cleanup_braces : rule is 'nl_struct_brace'
+log_rule(newlines_struct_union : rule is 'nl_define_macro'
+log_rule(newlines_cleanup_braces : rule is 'nl_ds_struct_enum_cmt'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
+log_rule(newlines_brace_pair : rule is 'nl_define_macro'
+log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
+log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
+log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
+newline_add_between : start->text() is ';', type is SEMICOLON, orig_line is 14, orig_col is 24
+newline_add_between : and end->text() is '}', orig_line is 15, orig_col is 1
+   [CallStack]
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_before_opening_brace_func_class_def'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
+log_rule(newlines_brace_pair : rule is 'nl_define_macro'
+log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
+log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
+log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
+log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
+log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
+newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
+newline_add_between : and end->text() is '}', orig_line is 7, orig_col is 1
+   [CallStack]
+newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
+newline_add_between : and end->text() is '}', orig_line is 7, orig_col is 1
+   [CallStack]
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_fparen'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
+log_rule(newlines_cleanup_braces : rule is 'eat_blanks_before_close_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_struct_var'
+log_rule(newlines_cleanup_braces : rule is 'nl_after_brace_close'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_start_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_args_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_single'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_end_multi_line'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_decl_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_type_name_class'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_class_scope'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_scope_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_proto_type_name'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_def_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_paren_empty'
+log_rule(newlines_cleanup_braces : rule is 'nl_func_call_args'
+log_rule(newlines_cleanup_braces : rule is 'nl_before_opening_brace_func_class_def'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_open'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
+log_rule(newlines_brace_pair : rule is 'nl_define_macro'
+log_rule(newlines_brace_pair : rule is 'nl_create_func_def_one_liner'
+log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
+log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
+log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
+log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
+newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
+newline_add_between : and end->text() is '}', orig_line is 11, orig_col is 1
+   [CallStack]
+newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
+newline_add_between : and end->text() is '}', orig_line is 11, orig_col is 1
+   [CallStack]
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_fparen'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
+log_rule(newlines_cleanup_braces : rule is 'eat_blanks_before_close_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_struct_var'
+log_rule(newlines_cleanup_braces : rule is 'nl_after_brace_close'
+log_rule(newlines_cleanup_braces : rule is 'nl_after_semicolon'
+log_rule(newlines_cleanup_braces : rule is 'nl_after_semicolon'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_square'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_fparen'
+log_rule(newlines_cleanup_braces : rule is 'nl_type_brace_init_lst_close'
+log_rule(newlines_cleanup_braces : rule is 'eat_blanks_before_close_brace'
+log_rule(newlines_cleanup_braces : rule is 'nl_brace_struct_var'
+log_rule(newlines_cleanup_braces : rule is 'nl_after_semicolon'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_end'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
+log_rule(newline_def_blk : rule is 'nl_var_def_blk_start'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_def'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_proto'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_def'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_proto'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_def'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_class_proto'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_def'
+log_rule(newlines_func_pre_blank_lines : rule is 'nl_before_func_body_proto'
+log_rule(newlines_class_colon_pos : rule is 'pos_class_colon'
+log_rule(newlines_class_colon_pos : rule is 'nl_class_colon'
+log_rule(newlines_class_colon_pos : rule is 'nl_class_init_args'
+log_rule(newlines_class_colon_pos : rule is 'pos_class_comma'
+log_rule(newlines_class_colon_pos : rule is 'align_constr_value_span'
+log_rule(newlines_class_colon_pos : rule is 'pos_constr_colon'
+log_rule(newlines_class_colon_pos : rule is 'nl_constr_colon'
+log_rule(newlines_class_colon_pos : rule is 'nl_constr_init_args'
+log_rule(newlines_class_colon_pos : rule is 'pos_constr_comma'
+log_rule(newlines_class_colon_pos : rule is 'align_constr_value_span'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(can_increase_nl : rule is 'nl_start_of_file'
+log_rule(can_increase_nl : rule is 'nl_end_of_file'
+log_rule(do_blank_lines : rule is 'nl_after_class'
+log_rule(do_blank_lines : rule is 'nl_after_struct'
+log_rule(newlines_functions_remove_extra_blank_lines : rule is 'nl_max_blank_in_func'
+newlines_functions_remove_extra_blank_lines : nl_max_blank_in_func is zero
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/28.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/28.txt
index d6e46ebb..f7553062 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/28.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/28.txt
@@ -1,186 +1,371 @@
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(parse_next : rule is 'disable_processing_nl_cont'
+log_rule(tokenize : rule is 'newlines'
+brace_cleanup : orig_line is 1, orig_col is 1, text() is 'struct'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 1, orig_col is 1, type is STRUCT, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
 parse_cleanup : orig_line is 1, type is STRUCT, text() is 'struct'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig_line is 1, orig_col is 8, text() is 'TelegramIndex'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 1, orig_col is 8, type is TYPE, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
 parse_cleanup : orig_line is 1, type is TYPE, text() is 'TelegramIndex'
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig_line is 1, orig_col is 21, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 2, orig_col is 1, text() is '{'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 2, orig_col is 1, type is BRACE_OPEN, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
 parse_cleanup : orig_line is 2, type is BRACE_OPEN, text() is '{'
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 2, orig_col is 2, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 3, orig_col is 1, text() is 'TelegramIndex'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is WORD, text() is 'TelegramIndex'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig_line is 3, orig_col is 14, text() is '('
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 14, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is PAREN_OPEN, text() is '('
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig_line is 3, orig_col is 15, text() is 'const'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 15, type is QUALIFIER, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is QUALIFIER, text() is 'const'
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
+brace_cleanup : orig_line is 3, orig_col is 21, text() is 'char'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 21, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is TYPE, text() is 'char'
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
+brace_cleanup : orig_line is 3, orig_col is 25, text() is '*'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 25, type is PTR_TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is PTR_TYPE, text() is '*'
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
+brace_cleanup : orig_line is 3, orig_col is 27, text() is 'pN'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 27, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is WORD, text() is 'pN'
 parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
 parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
+brace_cleanup : orig_line is 3, orig_col is 29, text() is ','
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 29, type is COMMA, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is COMMA, text() is ','
 parse_cleanup : frm.stmt_count is 6, frm.expr_count is 4
 parse_cleanup : frm.stmt_count is 7, frm.expr_count is 5
+brace_cleanup : orig_line is 3, orig_col is 31, text() is 'unsigned'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 31, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is TYPE, text() is 'unsigned'
 parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
+brace_cleanup : orig_line is 3, orig_col is 40, text() is 'long'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 40, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is TYPE, text() is 'long'
 parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
+brace_cleanup : orig_line is 3, orig_col is 45, text() is 'nI'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 45, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is WORD, text() is 'nI'
 parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
+brace_cleanup : orig_line is 3, orig_col is 47, text() is ')'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 47, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is PAREN_CLOSE, text() is ')'
 parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
 parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
+brace_cleanup : orig_line is 3, orig_col is 49, text() is ':'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 3, orig_col is 49, type is COLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 3, type is COLON, text() is ':'
 parse_cleanup : frm.stmt_count is 11, frm.expr_count is 4
 parse_cleanup : frm.stmt_count is 12, frm.expr_count is 5
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 3, orig_col is 50, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 4, orig_col is 1, text() is 'pTelName'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 4, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 4, type is WORD, text() is 'pTelName'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig_line is 4, orig_col is 9, text() is '('
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 4, orig_col is 9, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 4, type is PAREN_OPEN, text() is '('
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig_line is 4, orig_col is 10, text() is 'pN'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 4, orig_col is 10, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 4, type is WORD, text() is 'pN'
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
+brace_cleanup : orig_line is 4, orig_col is 12, text() is ')'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 4, orig_col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 4, type is PAREN_CLOSE, text() is ')'
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
+brace_cleanup : orig_line is 4, orig_col is 13, text() is ','
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 4, orig_col is 13, type is COMMA, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 4, type is COMMA, text() is ','
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 5, frm.expr_count is 3
+brace_cleanup : orig_line is 4, orig_col is 14, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 5, orig_col is 1, text() is 'nTelIndex'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 5, orig_col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 5, type is WORD, text() is 'nTelIndex'
 parse_cleanup : frm.stmt_count is 5, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
+brace_cleanup : orig_line is 5, orig_col is 10, text() is '('
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 5, orig_col is 10, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 5, type is PAREN_OPEN, text() is '('
 parse_cleanup : frm.stmt_count is 6, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 7, frm.expr_count is 2
+brace_cleanup : orig_line is 5, orig_col is 11, text() is 'n'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 5, orig_col is 11, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 5, type is WORD, text() is 'n'
 parse_cleanup : frm.stmt_count is 7, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
+brace_cleanup : orig_line is 5, orig_col is 12, text() is ')'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 5, orig_col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 5, type is PAREN_CLOSE, text() is ')'
 parse_cleanup : frm.stmt_count is 8, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
+brace_cleanup : orig_line is 5, orig_col is 13, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 6, orig_col is 1, text() is '{'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 6, orig_col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 6, type is BRACE_OPEN, text() is '{'
 parse_cleanup : frm.stmt_count is 9, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 10, frm.expr_count is 3
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 6, orig_col is 2, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 7, orig_col is 1, text() is '}'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 7, orig_col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 7, type is BRACE_CLOSE, text() is '}'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 7, orig_col is 2, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 9, orig_col is 1, text() is '~'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 9, orig_col is 1, type is INV, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 9, type is INV, text() is '~'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig_line is 9, orig_col is 2, text() is 'TelegramIndex'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 9, orig_col is 2, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 9, type is WORD, text() is 'TelegramIndex'
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
+brace_cleanup : orig_line is 9, orig_col is 15, text() is '('
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 9, orig_col is 15, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 9, type is PAREN_OPEN, text() is '('
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 2
+brace_cleanup : orig_line is 9, orig_col is 16, text() is ')'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 9, orig_col is 16, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 9, type is PAREN_CLOSE, text() is ')'
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
+brace_cleanup : orig_line is 9, orig_col is 17, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 10, orig_col is 1, text() is '{'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 10, orig_col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 10, type is BRACE_OPEN, text() is '{'
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 5, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 10, orig_col is 2, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 11, orig_col is 1, text() is '}'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 11, orig_col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 11, type is BRACE_CLOSE, text() is '}'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 11, orig_col is 2, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 13, orig_col is 1, text() is 'const'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 13, orig_col is 1, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 13, type is QUALIFIER, text() is 'const'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig_line is 13, orig_col is 7, text() is 'char'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 13, orig_col is 7, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 13, type is TYPE, text() is 'char'
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig_line is 13, orig_col is 11, text() is '*'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 13, orig_col is 11, type is PTR_TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 13, type is PTR_TYPE, text() is '*'
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
+brace_cleanup : orig_line is 13, orig_col is 13, text() is 'const'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 13, orig_col is 13, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 13, type is QUALIFIER, text() is 'const'
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
+brace_cleanup : orig_line is 13, orig_col is 19, text() is 'pTelName'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 13, orig_col is 19, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 13, type is WORD, text() is 'pTelName'
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
 parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
+brace_cleanup : orig_line is 13, orig_col is 27, text() is ';'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 13, orig_col is 27, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 13, type is SEMICOLON, text() is ';'
 parse_cleanup : frm.stmt_count is 5, frm.expr_count is 5
 parse_cleanup : frm.stmt_count is 6, frm.expr_count is 6
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 13, orig_col is 28, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 14, orig_col is 1, text() is 'unsigned'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 14, orig_col is 1, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 14, type is TYPE, text() is 'unsigned'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
+brace_cleanup : orig_line is 14, orig_col is 10, text() is 'long'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 14, orig_col is 10, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 14, type is TYPE, text() is 'long'
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
+brace_cleanup : orig_line is 14, orig_col is 15, text() is 'nTelIndex'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 14, orig_col is 15, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 14, type is WORD, text() is 'nTelIndex'
 parse_cleanup : frm.stmt_count is 2, frm.expr_count is 2
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
+brace_cleanup : orig_line is 14, orig_col is 24, text() is ';'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 14, orig_col is 24, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 14, type is SEMICOLON, text() is ';'
 parse_cleanup : frm.stmt_count is 3, frm.expr_count is 3
 parse_cleanup : frm.stmt_count is 4, frm.expr_count is 4
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 14, orig_col is 25, text() is ''
+brace_cleanup : pp_level is 0
+brace_cleanup : orig_line is 15, orig_col is 1, text() is '}'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 15, orig_col is 1, type is BRACE_CLOSE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE, []
 parse_cleanup : orig_line is 15, type is BRACE_CLOSE, text() is '}'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 15, orig_col is 2, text() is ';'
+brace_cleanup : pp_level is 0
 parse_cleanup : orig_line is 15, orig_col is 2, type is SEMICOLON, tos is 0, TOS.type is EOF, TOS.stage is NONE, []
 parse_cleanup : orig_line is 15, type is SEMICOLON, text() is ';'
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
 parse_cleanup : frm.stmt_count is 1, frm.expr_count is 1
 parse_cleanup : frm.stmt_count is 0, frm.expr_count is 0
+brace_cleanup : orig_line is 15, orig_col is 3, text() is ''
+brace_cleanup : pp_level is 0
+log_rule(enum_cleanup : rule is 'mod_enum_last_comma'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/31.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/31.txt
index d4e489e7..a890e117 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/31.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/31.txt
@@ -331,7 +331,7 @@ indent_text : orig_line is 3, orig_col is 1, column is 9, for 'TelegramIndex'
    []
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 3, orig_col is 9, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
+reindent_line : orig_line is 3, orig_col is 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
  [CallStack]
 indent_text : orig_line is 3, orig_col is 14, column is 22, for '('
    []
@@ -392,7 +392,7 @@ indent_text : orig_line is 4, orig_col is 1, column is 17, for 'pTelName'
    []
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 4, orig_col is 17, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
+reindent_line : orig_line is 4, orig_col is 1, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
  [CallStack]
 indent_text : orig_line is 4, orig_col is 9, column is 25, for '('
    []
@@ -423,7 +423,7 @@ indent_text : orig_line is 5, orig_col is 1, column is 17, for 'nTelIndex'
    []
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 5, orig_col is 17, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
+reindent_line : orig_line is 5, orig_col is 1, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
  [CallStack]
 indent_text : orig_line is 5, orig_col is 10, column is 26, for '('
    []
@@ -454,7 +454,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ... indent is 17
 indent_text : orig_line is 6, orig_col is 1, text() is '{', parent_type is FUNC_CLASS_DEF
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 6, orig_col is 9, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+reindent_line : orig_line is 6, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
  [CallStack]
 indent_text : orig_line is 6, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
@@ -466,7 +466,7 @@ indent_text : orig_line is 7, orig_col is 1, column is 9, for '}'
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc->orig_line is 7, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 7, orig_col is 9, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
+reindent_line : orig_line is 7, orig_col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
  [CallStack]
 indent_text : orig_line is 7, <Newline>
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
@@ -477,7 +477,7 @@ indent_text : orig_line is 9, orig_col is 1, column is 9, for '~'
    []
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 9, orig_col is 9, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
+reindent_line : orig_line is 9, orig_col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
  [CallStack]
 indent_text : orig_line is 9, orig_col is 2, column is 10, for 'TelegramIndex'
    []
@@ -507,7 +507,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ... indent is 17
 indent_text : orig_line is 10, orig_col is 1, text() is '{', parent_type is FUNC_CLASS_DEF
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-reindent_line : orig_line is 10, orig_col is 9, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+reindent_line : orig_line is 10, orig_col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
  [CallStack]
 indent_text : orig_line is 10, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
@@ -519,7 +519,7 @@ indent_text : orig_line is 11, orig_col is 1, column is 9, for '}'
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc->orig_line is 11, orig_col is 1, text() is '}', type is BRACE_CLOSE
-reindent_line : orig_line is 11, orig_col is 9, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
+reindent_line : orig_line is 11, orig_col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
  [CallStack]
 indent_text : orig_line is 11, <Newline>
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
@@ -530,7 +530,7 @@ indent_text : orig_line is 13, orig_col is 1, column is 9, for 'const'
    []
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 13, orig_col is 9, on 'const' [QUALIFIER/NONE] => 9
+reindent_line : orig_line is 13, orig_col is 1, on 'const' [QUALIFIER/NONE] => 9
  [CallStack]
 indent_text : orig_line is 13, orig_col is 7, column is 15, for 'char'
    []
@@ -561,7 +561,7 @@ indent_text : orig_line is 14, orig_col is 1, column is 9, for 'unsigned'
    []
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-reindent_line : orig_line is 14, orig_col is 9, on 'unsigned' [TYPE/NONE] => 9
+reindent_line : orig_line is 14, orig_col is 1, on 'unsigned' [TYPE/NONE] => 9
  [CallStack]
 indent_text : orig_line is 14, orig_col is 10, column is 18, for 'long'
    []
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/36.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/36.txt
index 892f5af5..892f5af5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/36.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/36.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/66.txt
new file mode 100644
index 00000000..2607cb69
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/66.txt
@@ -0,0 +1,741 @@
+space_text : orig_line is 1, orig_col is 1, 'struct' type is STRUCT
+space_text : back-to-back words need a space: pc->text() 'struct', next->text() 'TelegramIndex'
+space_text : orig_line is 1, orig_col is 1, pc-text() 'struct', type is STRUCT
+do_space : orig_line is 1, orig_col is 1, first->text() 'struct', type is STRUCT
+do_space : first->orig_line is 1, first->orig_col is 1, first->text() is 'struct', [STRUCT/NONE] <===>
+           second->orig_line is 1, second->orig_col is 8, second->text() is 'TelegramIndex', [TYPE/STRUCT] : rule ADD from add_space_table[ ]
+ensure_force_space : <force between 'struct' and 'TelegramIndex'> rule = ADD @ 1 => 8
+space_text : orig_line is 1, orig_col is 8, 'TelegramIndex' type is TYPE
+space_text : orig_line is 1, orig_col is 8, pc-text() 'TelegramIndex', type is TYPE
+do_space : orig_line is 1, orig_col is 8, first->text() 'TelegramIndex', type is TYPE
+ rule = REMOVE @ 0 => 21
+space_text : orig_line is 1, orig_col is 21, <Newline>, nl is 1
+space_text : orig_line is 2, orig_col is 1, '{' type is BRACE_OPEN
+space_text : orig_line is 2, orig_col is 1, pc-text() '{', type is BRACE_OPEN
+do_space : orig_line is 2, orig_col is 1, first->text() '{', type is BRACE_OPEN
+ rule = REMOVE @ 0 => 2
+space_text : orig_line is 2, orig_col is 2, <Newline>, nl is 1
+space_text : orig_line is 3, orig_col is 1, 'TelegramIndex' type is FUNC_CLASS_DEF
+space_text : orig_line is 3, orig_col is 1, pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF
+do_space : orig_line is 3, orig_col is 1, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
+do_space : first->orig_line is 3, first->orig_col is 1, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
+           second->orig_line is 3, second->orig_col is 14, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
+ rule = IGNORE @ 0 => 14
+space_text : orig_line is 3, orig_col is 14, '(' type is FPAREN_OPEN
+space_text : orig_line is 3, orig_col is 14, pc-text() '(', type is FPAREN_OPEN
+do_space : orig_line is 3, orig_col is 14, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 3, first->orig_col is 14, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
+           second->orig_line is 3, second->orig_col is 15, second->text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
+ rule = IGNORE @ 0 => 15
+space_text : orig_line is 3, orig_col is 15, 'const' type is QUALIFIER
+space_text : back-to-back words need a space: pc->text() 'const', next->text() 'char'
+space_text : orig_line is 3, orig_col is 15, pc-text() 'const', type is QUALIFIER
+do_space : orig_line is 3, orig_col is 15, first->text() 'const', type is QUALIFIER
+do_space : first->orig_line is 3, first->orig_col is 15, first->text() is 'const', [QUALIFIER/NONE] <===>
+           second->orig_line is 3, second->orig_col is 21, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'const' and 'char'> rule = FORCE @ 1 => 21
+space_text : orig_line is 3, orig_col is 21, 'char' type is TYPE
+space_text : orig_line is 3, orig_col is 21, pc-text() 'char', type is TYPE
+do_space : orig_line is 3, orig_col is 21, first->text() 'char', type is TYPE
+do_space : first->orig_line is 3, first->orig_col is 21, first->text() is 'char', [TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 25, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
+ rule = IGNORE @ 0 => 25
+space_text : orig_line is 3, orig_col is 25, '*' type is PTR_TYPE
+space_text : orig_line is 3, orig_col is 25, pc-text() '*', type is PTR_TYPE
+do_space : orig_line is 3, orig_col is 25, first->text() '*', type is PTR_TYPE
+do_space : first->orig_line is 3, first->orig_col is 25, first->text() is '*', [PTR_TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 27, second->text() is 'pN', [WORD/NONE] : rule IGNORE[ ]
+ rule = IGNORE @ 1 => 27
+space_text : orig_line is 3, orig_col is 27, 'pN' type is WORD
+space_text : orig_line is 3, orig_col is 27, pc-text() 'pN', type is WORD
+do_space : orig_line is 3, orig_col is 27, first->text() 'pN', type is WORD
+do_space : first->orig_line is 3, first->orig_col is 27, first->text() is 'pN', [WORD/NONE] <===>
+           second->orig_line is 3, second->orig_col is 29, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
+ rule = REMOVE @ 0 => 29
+space_text : orig_line is 3, orig_col is 29, ',' type is COMMA
+space_text : orig_line is 3, orig_col is 29, pc-text() ',', type is COMMA
+do_space : orig_line is 3, orig_col is 29, first->text() ',', type is COMMA
+do_space : first->orig_line is 3, first->orig_col is 29, first->text() is ',', [COMMA/NONE] <===>
+           second->orig_line is 3, second->orig_col is 31, second->text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
+ rule = IGNORE @ 1 => 31
+space_text : orig_line is 3, orig_col is 31, 'unsigned' type is TYPE
+space_text : back-to-back words need a space: pc->text() 'unsigned', next->text() 'long'
+space_text : orig_line is 3, orig_col is 31, pc-text() 'unsigned', type is TYPE
+do_space : orig_line is 3, orig_col is 31, first->text() 'unsigned', type is TYPE
+do_space : first->orig_line is 3, first->orig_col is 31, first->text() is 'unsigned', [TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 40, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 40
+space_text : orig_line is 3, orig_col is 40, 'long' type is TYPE
+space_text : back-to-back words need a space: pc->text() 'long', next->text() 'nI'
+space_text : orig_line is 3, orig_col is 40, pc-text() 'long', type is TYPE
+do_space : orig_line is 3, orig_col is 40, first->text() 'long', type is TYPE
+do_space : first->orig_line is 3, first->orig_col is 40, first->text() is 'long', [TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 45, second->text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'long' and 'nI'> rule = FORCE @ 1 => 45
+space_text : orig_line is 3, orig_col is 45, 'nI' type is WORD
+space_text : orig_line is 3, orig_col is 45, pc-text() 'nI', type is WORD
+do_space : orig_line is 3, orig_col is 45, first->text() 'nI', type is WORD
+do_space : first->orig_line is 3, first->orig_col is 45, first->text() is 'nI', [WORD/NONE] <===>
+           second->orig_line is 3, second->orig_col is 47, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
+ rule = IGNORE @ 0 => 47
+space_text : orig_line is 3, orig_col is 47, ')' type is FPAREN_CLOSE
+space_text : orig_line is 3, orig_col is 47, pc-text() ')', type is FPAREN_CLOSE
+do_space : orig_line is 3, orig_col is 47, first->text() ')', type is FPAREN_CLOSE
+do_space : first->orig_line is 3, first->orig_col is 47, first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
+           second->orig_line is 3, second->orig_col is 49, second->text() is ':', [CONSTR_COLON/NONE] : rule ADD from add_space_table[ ]
+ rule = ADD @ 1 => 49
+space_text : orig_line is 3, orig_col is 49, ':' type is CONSTR_COLON
+space_text : orig_line is 3, orig_col is 49, pc-text() ':', type is CONSTR_COLON
+do_space : orig_line is 3, orig_col is 49, first->text() ':', type is CONSTR_COLON
+ rule = REMOVE @ 0 => 50
+space_text : orig_line is 3, orig_col is 50, <Newline>, nl is 1
+space_text : orig_line is 4, orig_col is 1, 'pTelName' type is FUNC_CTOR_VAR
+space_text : orig_line is 4, orig_col is 1, pc-text() 'pTelName', type is FUNC_CTOR_VAR
+do_space : orig_line is 4, orig_col is 1, first->text() 'pTelName', type is FUNC_CTOR_VAR
+do_space : first->orig_line is 4, first->orig_col is 1, first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
+           second->orig_line is 4, second->orig_col is 9, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
+ rule = IGNORE @ 0 => 9
+space_text : orig_line is 4, orig_col is 9, '(' type is FPAREN_OPEN
+space_text : orig_line is 4, orig_col is 9, pc-text() '(', type is FPAREN_OPEN
+do_space : orig_line is 4, orig_col is 9, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 4, first->orig_col is 9, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
+           second->orig_line is 4, second->orig_col is 10, second->text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
+ rule = IGNORE @ 0 => 10
+space_text : orig_line is 4, orig_col is 10, 'pN' type is WORD
+space_text : orig_line is 4, orig_col is 10, pc-text() 'pN', type is WORD
+do_space : orig_line is 4, orig_col is 10, first->text() 'pN', type is WORD
+do_space : first->orig_line is 4, first->orig_col is 10, first->text() is 'pN', [WORD/NONE] <===>
+           second->orig_line is 4, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
+ rule = IGNORE @ 0 => 12
+space_text : orig_line is 4, orig_col is 12, ')' type is FPAREN_CLOSE
+space_text : orig_line is 4, orig_col is 12, pc-text() ')', type is FPAREN_CLOSE
+do_space : orig_line is 4, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
+do_space : first->orig_line is 4, first->orig_col is 12, first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
+           second->orig_line is 4, second->orig_col is 13, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
+ rule = REMOVE @ 0 => 13
+space_text : orig_line is 4, orig_col is 13, ',' type is COMMA
+space_text : orig_line is 4, orig_col is 13, pc-text() ',', type is COMMA
+do_space : orig_line is 4, orig_col is 13, first->text() ',', type is COMMA
+ rule = REMOVE @ 0 => 14
+space_text : orig_line is 4, orig_col is 14, <Newline>, nl is 1
+space_text : orig_line is 5, orig_col is 1, 'nTelIndex' type is FUNC_CTOR_VAR
+space_text : orig_line is 5, orig_col is 1, pc-text() 'nTelIndex', type is FUNC_CTOR_VAR
+do_space : orig_line is 5, orig_col is 1, first->text() 'nTelIndex', type is FUNC_CTOR_VAR
+do_space : first->orig_line is 5, first->orig_col is 1, first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
+           second->orig_line is 5, second->orig_col is 10, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
+ rule = IGNORE @ 0 => 10
+space_text : orig_line is 5, orig_col is 10, '(' type is FPAREN_OPEN
+space_text : orig_line is 5, orig_col is 10, pc-text() '(', type is FPAREN_OPEN
+do_space : orig_line is 5, orig_col is 10, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 5, first->orig_col is 10, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
+           second->orig_line is 5, second->orig_col is 11, second->text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
+ rule = IGNORE @ 0 => 11
+space_text : orig_line is 5, orig_col is 11, 'n' type is WORD
+space_text : orig_line is 5, orig_col is 11, pc-text() 'n', type is WORD
+do_space : orig_line is 5, orig_col is 11, first->text() 'n', type is WORD
+do_space : first->orig_line is 5, first->orig_col is 11, first->text() is 'n', [WORD/NONE] <===>
+           second->orig_line is 5, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
+ rule = IGNORE @ 0 => 12
+space_text : orig_line is 5, orig_col is 12, ')' type is FPAREN_CLOSE
+space_text : orig_line is 5, orig_col is 12, pc-text() ')', type is FPAREN_CLOSE
+do_space : orig_line is 5, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
+ rule = REMOVE @ 0 => 13
+space_text : orig_line is 5, orig_col is 13, <Newline>, nl is 1
+space_text : orig_line is 6, orig_col is 1, '{' type is BRACE_OPEN
+space_text : orig_line is 6, orig_col is 1, pc-text() '{', type is BRACE_OPEN
+do_space : orig_line is 6, orig_col is 1, first->text() '{', type is BRACE_OPEN
+ rule = REMOVE @ 0 => 2
+space_text : orig_line is 6, orig_col is 2, <Newline>, nl is 1
+space_text : orig_line is 7, orig_col is 1, '}' type is BRACE_CLOSE
+space_text : orig_line is 7, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
+do_space : orig_line is 7, orig_col is 1, first->text() '}', type is BRACE_CLOSE
+ rule = REMOVE @ 0 => 2
+space_text : orig_line is 7, orig_col is 2, <Newline>, nl is 2
+space_text : orig_line is 9, orig_col is 1, '~' type is DESTRUCTOR
+space_text : orig_line is 9, orig_col is 1, pc-text() '~', type is DESTRUCTOR
+do_space : orig_line is 9, orig_col is 1, first->text() '~', type is DESTRUCTOR
+do_space : first->orig_line is 9, first->orig_col is 1, first->text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
+           second->orig_line is 9, second->orig_col is 2, second->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
+ rule = REMOVE @ 0 => 2
+space_text : orig_line is 9, orig_col is 2, 'TelegramIndex' type is FUNC_CLASS_DEF
+space_text : orig_line is 9, orig_col is 2, pc-text() 'TelegramIndex', type is FUNC_CLASS_DEF
+do_space : orig_line is 9, orig_col is 2, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
+do_space : first->orig_line is 9, first->orig_col is 2, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
+           second->orig_line is 9, second->orig_col is 15, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
+ rule = IGNORE @ 0 => 15
+space_text : orig_line is 9, orig_col is 15, '(' type is FPAREN_OPEN
+space_text : orig_line is 9, orig_col is 15, pc-text() '(', type is FPAREN_OPEN
+do_space : orig_line is 9, orig_col is 15, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 9, first->orig_col is 15, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
+           second->orig_line is 9, second->orig_col is 16, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
+ rule = IGNORE @ 0 => 16
+space_text : orig_line is 9, orig_col is 16, ')' type is FPAREN_CLOSE
+space_text : orig_line is 9, orig_col is 16, pc-text() ')', type is FPAREN_CLOSE
+do_space : orig_line is 9, orig_col is 16, first->text() ')', type is FPAREN_CLOSE
+ rule = REMOVE @ 0 => 17
+space_text : orig_line is 9, orig_col is 17, <Newline>, nl is 1
+space_text : orig_line is 10, orig_col is 1, '{' type is BRACE_OPEN
+space_text : orig_line is 10, orig_col is 1, pc-text() '{', type is BRACE_OPEN
+do_space : orig_line is 10, orig_col is 1, first->text() '{', type is BRACE_OPEN
+ rule = REMOVE @ 0 => 2
+space_text : orig_line is 10, orig_col is 2, <Newline>, nl is 1
+space_text : orig_line is 11, orig_col is 1, '}' type is BRACE_CLOSE
+space_text : orig_line is 11, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
+do_space : orig_line is 11, orig_col is 1, first->text() '}', type is BRACE_CLOSE
+ rule = REMOVE @ 0 => 2
+space_text : orig_line is 11, orig_col is 2, <Newline>, nl is 2
+space_text : orig_line is 13, orig_col is 1, 'const' type is QUALIFIER
+space_text : back-to-back words need a space: pc->text() 'const', next->text() 'char'
+space_text : orig_line is 13, orig_col is 1, pc-text() 'const', type is QUALIFIER
+do_space : orig_line is 13, orig_col is 1, first->text() 'const', type is QUALIFIER
+do_space : first->orig_line is 13, first->orig_col is 1, first->text() is 'const', [QUALIFIER/NONE] <===>
+           second->orig_line is 13, second->orig_col is 7, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'const' and 'char'> rule = FORCE @ 1 => 7
+space_text : orig_line is 13, orig_col is 7, 'char' type is TYPE
+space_text : orig_line is 13, orig_col is 7, pc-text() 'char', type is TYPE
+do_space : orig_line is 13, orig_col is 7, first->text() 'char', type is TYPE
+do_space : first->orig_line is 13, first->orig_col is 7, first->text() is 'char', [TYPE/NONE] <===>
+           second->orig_line is 13, second->orig_col is 11, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
+ rule = IGNORE @ 0 => 11
+space_text : orig_line is 13, orig_col is 11, '*' type is PTR_TYPE
+space_text : orig_line is 13, orig_col is 11, pc-text() '*', type is PTR_TYPE
+do_space : orig_line is 13, orig_col is 11, first->text() '*', type is PTR_TYPE
+do_space : first->orig_line is 13, first->orig_col is 11, first->text() is '*', [PTR_TYPE/NONE] <===>
+           second->orig_line is 13, second->orig_col is 13, second->text() is 'const', [QUALIFIER/NONE] : rule IGNORE[ ]
+ rule = IGNORE @ 1 => 13
+space_text : orig_line is 13, orig_col is 13, 'const' type is QUALIFIER
+space_text : back-to-back words need a space: pc->text() 'const', next->text() 'pTelName'
+space_text : orig_line is 13, orig_col is 13, pc-text() 'const', type is QUALIFIER
+do_space : orig_line is 13, orig_col is 13, first->text() 'const', type is QUALIFIER
+do_space : first->orig_line is 13, first->orig_col is 13, first->text() is 'const', [QUALIFIER/NONE] <===>
+           second->orig_line is 13, second->orig_col is 19, second->text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'const' and 'pTelName'> rule = FORCE @ 1 => 19
+space_text : orig_line is 13, orig_col is 19, 'pTelName' type is WORD
+space_text : orig_line is 13, orig_col is 19, pc-text() 'pTelName', type is WORD
+do_space : orig_line is 13, orig_col is 19, first->text() 'pTelName', type is WORD
+do_space : first->orig_line is 13, first->orig_col is 19, first->text() is 'pTelName', [WORD/NONE] <===>
+           second->orig_line is 13, second->orig_col is 27, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
+ rule = REMOVE @ 0 => 27
+space_text : orig_line is 13, orig_col is 27, ';' type is SEMICOLON
+space_text : orig_line is 13, orig_col is 27, pc-text() ';', type is SEMICOLON
+do_space : orig_line is 13, orig_col is 27, first->text() ';', type is SEMICOLON
+ rule = REMOVE @ 0 => 28
+space_text : orig_line is 13, orig_col is 28, <Newline>, nl is 1
+space_text : orig_line is 14, orig_col is 1, 'unsigned' type is TYPE
+space_text : back-to-back words need a space: pc->text() 'unsigned', next->text() 'long'
+space_text : orig_line is 14, orig_col is 1, pc-text() 'unsigned', type is TYPE
+do_space : orig_line is 14, orig_col is 1, first->text() 'unsigned', type is TYPE
+do_space : first->orig_line is 14, first->orig_col is 1, first->text() is 'unsigned', [TYPE/NONE] <===>
+           second->orig_line is 14, second->orig_col is 10, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'unsigned' and 'long'> rule = FORCE @ 1 => 10
+space_text : orig_line is 14, orig_col is 10, 'long' type is TYPE
+space_text : back-to-back words need a space: pc->text() 'long', next->text() 'nTelIndex'
+space_text : orig_line is 14, orig_col is 10, pc-text() 'long', type is TYPE
+do_space : orig_line is 14, orig_col is 10, first->text() 'long', type is TYPE
+do_space : first->orig_line is 14, first->orig_col is 10, first->text() is 'long', [TYPE/NONE] <===>
+           second->orig_line is 14, second->orig_col is 15, second->text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'long' and 'nTelIndex'> rule = FORCE @ 1 => 15
+space_text : orig_line is 14, orig_col is 15, 'nTelIndex' type is WORD
+space_text : orig_line is 14, orig_col is 15, pc-text() 'nTelIndex', type is WORD
+do_space : orig_line is 14, orig_col is 15, first->text() 'nTelIndex', type is WORD
+do_space : first->orig_line is 14, first->orig_col is 15, first->text() is 'nTelIndex', [WORD/NONE] <===>
+           second->orig_line is 14, second->orig_col is 24, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
+ rule = REMOVE @ 0 => 24
+space_text : orig_line is 14, orig_col is 24, ';' type is SEMICOLON
+space_text : orig_line is 14, orig_col is 24, pc-text() ';', type is SEMICOLON
+do_space : orig_line is 14, orig_col is 24, first->text() ';', type is SEMICOLON
+ rule = REMOVE @ 0 => 25
+space_text : orig_line is 14, orig_col is 25, <Newline>, nl is 1
+space_text : orig_line is 15, orig_col is 1, '}' type is BRACE_CLOSE
+space_text : orig_line is 15, orig_col is 1, pc-text() '}', type is BRACE_CLOSE
+do_space : orig_line is 15, orig_col is 1, first->text() '}', type is BRACE_CLOSE
+do_space : first->orig_line is 15, first->orig_col is 1, first->text() is '}', [BRACE_CLOSE/STRUCT] <===>
+           second->orig_line is 15, second->orig_col is 2, second->text() is ';', [SEMICOLON/STRUCT] : rule sp_before_semi[ ]
+ rule = REMOVE @ 0 => 2
+space_text : orig_line is 15, orig_col is 2, ';' type is SEMICOLON
+space_text : orig_line is 15, orig_col is 2, pc-text() ';', type is SEMICOLON
+do_space : orig_line is 15, orig_col is 2, first->text() ';', type is SEMICOLON
+ rule = REMOVE @ 0 => 3
+space_text : orig_line is 15, orig_col is 3, <Newline>, nl is 2
+space_col_align : first->orig_line is 3, orig_col is 1, [FUNC_CLASS_DEF/NONE], text() 'TelegramIndex' <==>
+space_col_align : second->orig_line is 3, orig_col is 14 [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(', [CallStack]
+do_space : orig_line is 3, orig_col is 1, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
+do_space : first->orig_line is 3, first->orig_col is 1, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
+           second->orig_line is 3, second->orig_col is 14, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
+space_col_align : av is ignore
+space_col_align :    len is 13
+space_col_align :    => coldiff is 13
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 3
+space_col_align :    => second->orig_line is 3
+space_col_align :    => first->text()     is 'TelegramIndex'
+space_col_align :    => second->text()    is '('
+space_col_align :    => first->orig_col   is 1
+space_col_align :    => second->orig_col  is 14
+space_col_align :    => first->len()      is 13
+space_col_align :    => coldiff is 13
+space_col_align : first->orig_line is 3, orig_col is 14, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
+space_col_align : second->orig_line is 3, orig_col is 15 [QUALIFIER/NONE], text() 'const', [CallStack]
+do_space : orig_line is 3, orig_col is 14, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 3, first->orig_col is 14, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
+           second->orig_line is 3, second->orig_col is 15, second->text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 3
+space_col_align :    => second->orig_line is 3
+space_col_align :    => first->text()     is '('
+space_col_align :    => second->text()    is 'const'
+space_col_align :    => first->orig_col   is 14
+space_col_align :    => second->orig_col  is 15
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 3, orig_col is 15, [QUALIFIER/NONE], text() 'const' <==>
+space_col_align : second->orig_line is 3, orig_col is 21 [TYPE/NONE], text() 'char', [CallStack]
+do_space : orig_line is 3, orig_col is 15, first->text() 'const', type is QUALIFIER
+do_space : first->orig_line is 3, first->orig_col is 15, first->text() is 'const', [QUALIFIER/NONE] <===>
+           second->orig_line is 3, second->orig_col is 21, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'const' and 'char'>space_col_align : av is force
+space_col_align :    len is 5
+space_col_align :    => coldiff is 5
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 6
+space_col_align : first->orig_line is 3, orig_col is 21, [TYPE/NONE], text() 'char' <==>
+space_col_align : second->orig_line is 3, orig_col is 25 [PTR_TYPE/NONE], text() '*', [CallStack]
+do_space : orig_line is 3, orig_col is 21, first->text() 'char', type is TYPE
+do_space : first->orig_line is 3, first->orig_col is 21, first->text() is 'char', [TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 25, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
+space_col_align : av is ignore
+space_col_align :    len is 4
+space_col_align :    => coldiff is 4
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 3
+space_col_align :    => second->orig_line is 3
+space_col_align :    => first->text()     is 'char'
+space_col_align :    => second->text()    is '*'
+space_col_align :    => first->orig_col   is 21
+space_col_align :    => second->orig_col  is 25
+space_col_align :    => first->len()      is 4
+space_col_align :    => coldiff is 4
+space_col_align : first->orig_line is 3, orig_col is 25, [PTR_TYPE/NONE], text() '*' <==>
+space_col_align : second->orig_line is 3, orig_col is 27 [WORD/NONE], text() 'pN', [CallStack]
+do_space : orig_line is 3, orig_col is 25, first->text() '*', type is PTR_TYPE
+do_space : first->orig_line is 3, first->orig_col is 25, first->text() is '*', [PTR_TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 27, second->text() is 'pN', [WORD/NONE] : rule IGNORE[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 3
+space_col_align :    => second->orig_line is 3
+space_col_align :    => first->text()     is '*'
+space_col_align :    => second->text()    is 'pN'
+space_col_align :    => first->orig_col   is 25
+space_col_align :    => second->orig_col  is 27
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 2
+space_col_align : first->orig_line is 3, orig_col is 27, [WORD/NONE], text() 'pN' <==>
+space_col_align : second->orig_line is 3, orig_col is 29 [COMMA/NONE], text() ',', [CallStack]
+do_space : orig_line is 3, orig_col is 27, first->text() 'pN', type is WORD
+do_space : first->orig_line is 3, first->orig_col is 27, first->text() is 'pN', [WORD/NONE] <===>
+           second->orig_line is 3, second->orig_col is 29, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
+space_col_align : av is remove
+space_col_align :    len is 2
+space_col_align :    => coldiff is 2
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 2
+space_col_align : first->orig_line is 3, orig_col is 29, [COMMA/NONE], text() ',' <==>
+space_col_align : second->orig_line is 3, orig_col is 31 [TYPE/NONE], text() 'unsigned', [CallStack]
+do_space : orig_line is 3, orig_col is 29, first->text() ',', type is COMMA
+do_space : first->orig_line is 3, first->orig_col is 29, first->text() is ',', [COMMA/NONE] <===>
+           second->orig_line is 3, second->orig_col is 31, second->text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 3
+space_col_align :    => second->orig_line is 3
+space_col_align :    => first->text()     is ','
+space_col_align :    => second->text()    is 'unsigned'
+space_col_align :    => first->orig_col   is 29
+space_col_align :    => second->orig_col  is 31
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 2
+space_col_align : first->orig_line is 3, orig_col is 31, [TYPE/NONE], text() 'unsigned' <==>
+space_col_align : second->orig_line is 3, orig_col is 40 [TYPE/NONE], text() 'long', [CallStack]
+do_space : orig_line is 3, orig_col is 31, first->text() 'unsigned', type is TYPE
+do_space : first->orig_line is 3, first->orig_col is 31, first->text() is 'unsigned', [TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 40, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'unsigned' and 'long'>space_col_align : av is force
+space_col_align :    len is 8
+space_col_align :    => coldiff is 8
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 9
+space_col_align : first->orig_line is 3, orig_col is 40, [TYPE/NONE], text() 'long' <==>
+space_col_align : second->orig_line is 3, orig_col is 45 [WORD/NONE], text() 'nI', [CallStack]
+do_space : orig_line is 3, orig_col is 40, first->text() 'long', type is TYPE
+do_space : first->orig_line is 3, first->orig_col is 40, first->text() is 'long', [TYPE/NONE] <===>
+           second->orig_line is 3, second->orig_col is 45, second->text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'long' and 'nI'>space_col_align : av is force
+space_col_align :    len is 4
+space_col_align :    => coldiff is 4
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 5
+space_col_align : first->orig_line is 3, orig_col is 45, [WORD/NONE], text() 'nI' <==>
+space_col_align : second->orig_line is 3, orig_col is 47 [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')', [CallStack]
+do_space : orig_line is 3, orig_col is 45, first->text() 'nI', type is WORD
+do_space : first->orig_line is 3, first->orig_col is 45, first->text() is 'nI', [WORD/NONE] <===>
+           second->orig_line is 3, second->orig_col is 47, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
+space_col_align : av is ignore
+space_col_align :    len is 2
+space_col_align :    => coldiff is 2
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 3
+space_col_align :    => second->orig_line is 3
+space_col_align :    => first->text()     is 'nI'
+space_col_align :    => second->text()    is ')'
+space_col_align :    => first->orig_col   is 45
+space_col_align :    => second->orig_col  is 47
+space_col_align :    => first->len()      is 2
+space_col_align :    => coldiff is 2
+space_col_align : first->orig_line is 3, orig_col is 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
+space_col_align : second->orig_line is 3, orig_col is 49 [CONSTR_COLON/NONE], text() ':', [CallStack]
+do_space : orig_line is 3, orig_col is 47, first->text() ')', type is FPAREN_CLOSE
+do_space : first->orig_line is 3, first->orig_col is 47, first->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
+           second->orig_line is 3, second->orig_col is 49, second->text() is ':', [CONSTR_COLON/NONE] : rule ADD from add_space_table[ ]
+space_col_align : av is add
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is ADD
+space_col_align :    => coldiff is 2
+space_col_align : first->orig_line is 3, orig_col is 49, [CONSTR_COLON/NONE], text() ':' <==>
+space_col_align : second->orig_line is 3, orig_col is 50 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 3, orig_col is 49, first->text() ':', type is CONSTR_COLON
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 4, orig_col is 1, [FUNC_CTOR_VAR/NONE], text() 'pTelName' <==>
+space_col_align : second->orig_line is 4, orig_col is 9 [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(', [CallStack]
+do_space : orig_line is 4, orig_col is 1, first->text() 'pTelName', type is FUNC_CTOR_VAR
+do_space : first->orig_line is 4, first->orig_col is 1, first->text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
+           second->orig_line is 4, second->orig_col is 9, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
+space_col_align : av is ignore
+space_col_align :    len is 8
+space_col_align :    => coldiff is 8
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 4
+space_col_align :    => second->orig_line is 4
+space_col_align :    => first->text()     is 'pTelName'
+space_col_align :    => second->text()    is '('
+space_col_align :    => first->orig_col   is 1
+space_col_align :    => second->orig_col  is 9
+space_col_align :    => first->len()      is 8
+space_col_align :    => coldiff is 8
+space_col_align : first->orig_line is 4, orig_col is 9, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
+space_col_align : second->orig_line is 4, orig_col is 10 [WORD/NONE], text() 'pN', [CallStack]
+do_space : orig_line is 4, orig_col is 9, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 4, first->orig_col is 9, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
+           second->orig_line is 4, second->orig_col is 10, second->text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 4
+space_col_align :    => second->orig_line is 4
+space_col_align :    => first->text()     is '('
+space_col_align :    => second->text()    is 'pN'
+space_col_align :    => first->orig_col   is 9
+space_col_align :    => second->orig_col  is 10
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 4, orig_col is 10, [WORD/NONE], text() 'pN' <==>
+space_col_align : second->orig_line is 4, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
+do_space : orig_line is 4, orig_col is 10, first->text() 'pN', type is WORD
+do_space : first->orig_line is 4, first->orig_col is 10, first->text() is 'pN', [WORD/NONE] <===>
+           second->orig_line is 4, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
+space_col_align : av is ignore
+space_col_align :    len is 2
+space_col_align :    => coldiff is 2
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 4
+space_col_align :    => second->orig_line is 4
+space_col_align :    => first->text()     is 'pN'
+space_col_align :    => second->text()    is ')'
+space_col_align :    => first->orig_col   is 10
+space_col_align :    => second->orig_col  is 12
+space_col_align :    => first->len()      is 2
+space_col_align :    => coldiff is 2
+space_col_align : first->orig_line is 4, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
+space_col_align : second->orig_line is 4, orig_col is 13 [COMMA/NONE], text() ',', [CallStack]
+do_space : orig_line is 4, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
+do_space : first->orig_line is 4, first->orig_col is 12, first->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
+           second->orig_line is 4, second->orig_col is 13, second->text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 4, orig_col is 13, [COMMA/NONE], text() ',' <==>
+space_col_align : second->orig_line is 4, orig_col is 14 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 4, orig_col is 13, first->text() ',', type is COMMA
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 5, orig_col is 1, [FUNC_CTOR_VAR/NONE], text() 'nTelIndex' <==>
+space_col_align : second->orig_line is 5, orig_col is 10 [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(', [CallStack]
+do_space : orig_line is 5, orig_col is 1, first->text() 'nTelIndex', type is FUNC_CTOR_VAR
+do_space : first->orig_line is 5, first->orig_col is 1, first->text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
+           second->orig_line is 5, second->orig_col is 10, second->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
+space_col_align : av is ignore
+space_col_align :    len is 9
+space_col_align :    => coldiff is 9
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 5
+space_col_align :    => second->orig_line is 5
+space_col_align :    => first->text()     is 'nTelIndex'
+space_col_align :    => second->text()    is '('
+space_col_align :    => first->orig_col   is 1
+space_col_align :    => second->orig_col  is 10
+space_col_align :    => first->len()      is 9
+space_col_align :    => coldiff is 9
+space_col_align : first->orig_line is 5, orig_col is 10, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
+space_col_align : second->orig_line is 5, orig_col is 11 [WORD/NONE], text() 'n', [CallStack]
+do_space : orig_line is 5, orig_col is 10, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 5, first->orig_col is 10, first->text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
+           second->orig_line is 5, second->orig_col is 11, second->text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 5
+space_col_align :    => second->orig_line is 5
+space_col_align :    => first->text()     is '('
+space_col_align :    => second->text()    is 'n'
+space_col_align :    => first->orig_col   is 10
+space_col_align :    => second->orig_col  is 11
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 5, orig_col is 11, [WORD/NONE], text() 'n' <==>
+space_col_align : second->orig_line is 5, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
+do_space : orig_line is 5, orig_col is 11, first->text() 'n', type is WORD
+do_space : first->orig_line is 5, first->orig_col is 11, first->text() is 'n', [WORD/NONE] <===>
+           second->orig_line is 5, second->orig_col is 12, second->text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 5
+space_col_align :    => second->orig_line is 5
+space_col_align :    => first->text()     is 'n'
+space_col_align :    => second->text()    is ')'
+space_col_align :    => first->orig_col   is 11
+space_col_align :    => second->orig_col  is 12
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 5, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
+space_col_align : second->orig_line is 5, orig_col is 13 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 5, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 6, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], text() '{' <==>
+space_col_align : second->orig_line is 6, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 6, orig_col is 1, first->text() '{', type is BRACE_OPEN
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 7, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text() '}' <==>
+space_col_align : second->orig_line is 7, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 7, orig_col is 1, first->text() '}', type is BRACE_CLOSE
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 9, orig_col is 1, [DESTRUCTOR/FUNC_CLASS_DEF], text() '~' <==>
+space_col_align : second->orig_line is 9, orig_col is 2 [FUNC_CLASS_DEF/DESTRUCTOR], text() 'TelegramIndex', [CallStack]
+do_space : orig_line is 9, orig_col is 1, first->text() '~', type is DESTRUCTOR
+do_space : first->orig_line is 9, first->orig_col is 1, first->text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
+           second->orig_line is 9, second->orig_col is 2, second->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 9, orig_col is 2, [FUNC_CLASS_DEF/DESTRUCTOR], text() 'TelegramIndex' <==>
+space_col_align : second->orig_line is 9, orig_col is 15 [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(', [CallStack]
+do_space : orig_line is 9, orig_col is 2, first->text() 'TelegramIndex', type is FUNC_CLASS_DEF
+do_space : first->orig_line is 9, first->orig_col is 2, first->text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
+           second->orig_line is 9, second->orig_col is 15, second->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
+space_col_align : av is ignore
+space_col_align :    len is 13
+space_col_align :    => coldiff is 13
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 9
+space_col_align :    => second->orig_line is 9
+space_col_align :    => first->text()     is 'TelegramIndex'
+space_col_align :    => second->text()    is '('
+space_col_align :    => first->orig_col   is 2
+space_col_align :    => second->orig_col  is 15
+space_col_align :    => first->len()      is 13
+space_col_align :    => coldiff is 13
+space_col_align : first->orig_line is 9, orig_col is 15, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
+space_col_align : second->orig_line is 9, orig_col is 16 [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')', [CallStack]
+do_space : orig_line is 9, orig_col is 15, first->text() '(', type is FPAREN_OPEN
+do_space : first->orig_line is 9, first->orig_col is 15, first->text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
+           second->orig_line is 9, second->orig_col is 16, second->text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 9
+space_col_align :    => second->orig_line is 9
+space_col_align :    => first->text()     is '('
+space_col_align :    => second->text()    is ')'
+space_col_align :    => first->orig_col   is 15
+space_col_align :    => second->orig_col  is 16
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 9, orig_col is 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
+space_col_align : second->orig_line is 9, orig_col is 17 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 9, orig_col is 16, first->text() ')', type is FPAREN_CLOSE
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 10, orig_col is 1, [BRACE_OPEN/FUNC_CLASS_DEF], text() '{' <==>
+space_col_align : second->orig_line is 10, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 10, orig_col is 1, first->text() '{', type is BRACE_OPEN
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 11, orig_col is 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text() '}' <==>
+space_col_align : second->orig_line is 11, orig_col is 2 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 11, orig_col is 1, first->text() '}', type is BRACE_CLOSE
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 13, orig_col is 1, [QUALIFIER/NONE], text() 'const' <==>
+space_col_align : second->orig_line is 13, orig_col is 7 [TYPE/NONE], text() 'char', [CallStack]
+do_space : orig_line is 13, orig_col is 1, first->text() 'const', type is QUALIFIER
+do_space : first->orig_line is 13, first->orig_col is 1, first->text() is 'const', [QUALIFIER/NONE] <===>
+           second->orig_line is 13, second->orig_col is 7, second->text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'const' and 'char'>space_col_align : av is force
+space_col_align :    len is 5
+space_col_align :    => coldiff is 5
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 6
+space_col_align : first->orig_line is 13, orig_col is 7, [TYPE/NONE], text() 'char' <==>
+space_col_align : second->orig_line is 13, orig_col is 11 [PTR_TYPE/NONE], text() '*', [CallStack]
+do_space : orig_line is 13, orig_col is 7, first->text() 'char', type is TYPE
+do_space : first->orig_line is 13, first->orig_col is 7, first->text() is 'char', [TYPE/NONE] <===>
+           second->orig_line is 13, second->orig_col is 11, second->text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
+space_col_align : av is ignore
+space_col_align :    len is 4
+space_col_align :    => coldiff is 4
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 13
+space_col_align :    => second->orig_line is 13
+space_col_align :    => first->text()     is 'char'
+space_col_align :    => second->text()    is '*'
+space_col_align :    => first->orig_col   is 7
+space_col_align :    => second->orig_col  is 11
+space_col_align :    => first->len()      is 4
+space_col_align :    => coldiff is 4
+space_col_align : first->orig_line is 13, orig_col is 11, [PTR_TYPE/NONE], text() '*' <==>
+space_col_align : second->orig_line is 13, orig_col is 13 [QUALIFIER/NONE], text() 'const', [CallStack]
+do_space : orig_line is 13, orig_col is 11, first->text() '*', type is PTR_TYPE
+do_space : first->orig_line is 13, first->orig_col is 11, first->text() is '*', [PTR_TYPE/NONE] <===>
+           second->orig_line is 13, second->orig_col is 13, second->text() is 'const', [QUALIFIER/NONE] : rule IGNORE[ ]
+space_col_align : av is ignore
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is IGNORE
+space_col_align :    => first->orig_line  is 13
+space_col_align :    => second->orig_line is 13
+space_col_align :    => first->text()     is '*'
+space_col_align :    => second->text()    is 'const'
+space_col_align :    => first->orig_col   is 11
+space_col_align :    => second->orig_col  is 13
+space_col_align :    => first->len()      is 1
+space_col_align :    => coldiff is 2
+space_col_align : first->orig_line is 13, orig_col is 13, [QUALIFIER/NONE], text() 'const' <==>
+space_col_align : second->orig_line is 13, orig_col is 19 [WORD/NONE], text() 'pTelName', [CallStack]
+do_space : orig_line is 13, orig_col is 13, first->text() 'const', type is QUALIFIER
+do_space : first->orig_line is 13, first->orig_col is 13, first->text() is 'const', [QUALIFIER/NONE] <===>
+           second->orig_line is 13, second->orig_col is 19, second->text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'const' and 'pTelName'>space_col_align : av is force
+space_col_align :    len is 5
+space_col_align :    => coldiff is 5
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 6
+space_col_align : first->orig_line is 13, orig_col is 19, [WORD/NONE], text() 'pTelName' <==>
+space_col_align : second->orig_line is 13, orig_col is 27 [SEMICOLON/NONE], text() ';', [CallStack]
+do_space : orig_line is 13, orig_col is 19, first->text() 'pTelName', type is WORD
+do_space : first->orig_line is 13, first->orig_col is 19, first->text() is 'pTelName', [WORD/NONE] <===>
+           second->orig_line is 13, second->orig_col is 27, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
+space_col_align : av is remove
+space_col_align :    len is 8
+space_col_align :    => coldiff is 8
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 8
+space_col_align : first->orig_line is 13, orig_col is 27, [SEMICOLON/NONE], text() ';' <==>
+space_col_align : second->orig_line is 13, orig_col is 28 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 13, orig_col is 27, first->text() ';', type is SEMICOLON
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
+space_col_align : first->orig_line is 14, orig_col is 1, [TYPE/NONE], text() 'unsigned' <==>
+space_col_align : second->orig_line is 14, orig_col is 10 [TYPE/NONE], text() 'long', [CallStack]
+do_space : orig_line is 14, orig_col is 1, first->text() 'unsigned', type is TYPE
+do_space : first->orig_line is 14, first->orig_col is 1, first->text() is 'unsigned', [TYPE/NONE] <===>
+           second->orig_line is 14, second->orig_col is 10, second->text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'unsigned' and 'long'>space_col_align : av is force
+space_col_align :    len is 8
+space_col_align :    => coldiff is 8
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 9
+space_col_align : first->orig_line is 14, orig_col is 10, [TYPE/NONE], text() 'long' <==>
+space_col_align : second->orig_line is 14, orig_col is 15 [WORD/NONE], text() 'nTelIndex', [CallStack]
+do_space : orig_line is 14, orig_col is 10, first->text() 'long', type is TYPE
+do_space : first->orig_line is 14, first->orig_col is 10, first->text() is 'long', [TYPE/NONE] <===>
+           second->orig_line is 14, second->orig_col is 15, second->text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
+ensure_force_space : <force between 'long' and 'nTelIndex'>space_col_align : av is force
+space_col_align :    len is 4
+space_col_align :    => coldiff is 4
+space_col_align :    => av is FORCE
+space_col_align :    => coldiff is 5
+space_col_align : first->orig_line is 14, orig_col is 15, [WORD/NONE], text() 'nTelIndex' <==>
+space_col_align : second->orig_line is 14, orig_col is 24 [SEMICOLON/NONE], text() ';', [CallStack]
+do_space : orig_line is 14, orig_col is 15, first->text() 'nTelIndex', type is WORD
+do_space : first->orig_line is 14, first->orig_col is 15, first->text() is 'nTelIndex', [WORD/NONE] <===>
+           second->orig_line is 14, second->orig_col is 24, second->text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
+space_col_align : av is remove
+space_col_align :    len is 9
+space_col_align :    => coldiff is 9
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 9
+space_col_align : first->orig_line is 14, orig_col is 24, [SEMICOLON/NONE], text() ';' <==>
+space_col_align : second->orig_line is 14, orig_col is 25 [NEWLINE/NONE], text() '', [CallStack]
+do_space : orig_line is 14, orig_col is 24, first->text() ';', type is SEMICOLON
+space_col_align : av is remove
+space_col_align :    len is 1
+space_col_align :    => coldiff is 1
+space_col_align :    => av is REMOVE
+space_col_align :    => coldiff is 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/9.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/9.txt
index 98afe921..98afe921 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/9.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/9.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/92.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/92.txt
index 4bac4886..eb0d7c05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/92.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/92.txt
@@ -162,7 +162,11 @@ tokenize_cleanup : orig_line is 3, orig_col is 25, pc->text() '*'
    pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE
 tokenize_cleanup : orig_line is 13, orig_col is 11, pc->text() '*'
    pc->type is STAR, pc->parent_type is NONE => *type is PTR_TYPE, *parent_type is NONE
-mark_class_ctor : orig_line is 3, orig_col is 1, pc->text() 'TelegramIndex'
+try_find_end_chunk : orig_line is 1, orig_col is 8, pc->text() 'TelegramIndex'
+   pc->type is TYPE, pc->parent_type is NONE => *type is WORD, *parent_type is NONE
+make_type : orig_line is 1, orig_col is 8, pc->text() 'TelegramIndex'
+   pc->type is WORD, pc->parent_type is NONE => *type is TYPE, *parent_type is NONE
+mark_constructors : orig_line is 3, orig_col is 1, pc->text() 'TelegramIndex'
    pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE
 flag_parens : orig_line is 3, orig_col is 14, pc->text() '('
    pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
@@ -182,7 +186,7 @@ flag_parens : orig_line is 5, orig_col is 10, pc->text() '('
    pc->type is PAREN_OPEN, pc->parent_type is NONE => *type is FPAREN_OPEN, *parent_type is NONE
 flag_parens : orig_line is 5, orig_col is 12, pc->text() ')'
    pc->type is PAREN_CLOSE, pc->parent_type is NONE => *type is FPAREN_CLOSE, *parent_type is NONE
-mark_class_ctor : orig_line is 9, orig_col is 2, pc->text() 'TelegramIndex'
+mark_constructors : orig_line is 9, orig_col is 2, pc->text() 'TelegramIndex'
    pc->type is WORD, pc->parent_type is NONE => *type is FUNC_CLASS_DEF, *parent_type is NONE
 mark_cpp_constructor : orig_line is 9, orig_col is 1, pc->text() '~'
    pc->type is INV, pc->parent_type is NONE => *type is DESTRUCTOR, *parent_type is NONE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/Debug_tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/Debug_tracking_space.html
new file mode 100644
index 00000000..5cc68ada
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/Debug_tracking_space.html
@@ -0,0 +1,23 @@
+<html>
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+   <title>Uncrustify: where do the Spaces options work</title>
+</head>
+<body lang="en-US">
+<p>
+</p>
+<pre>
+{
+   a<a title="1,sp_assign"><font color="red">M</font></a>=<a title="2,69,sp_assign"><font color="red">M</font></a>b<a title="3,70,75,sp_arith"><font color="red">M</font></a>+<a title="4,71,76,80,sp_arith"><font color="red">M</font></a>111<a title="5,72,77,81,84,sp_arith"><font color="red">M</font></a>-<a title="6,73,78,82,85,87,sp_arith"><font color="red">M</font></a>55<a title="7,74,79,83,86,88,89,sp_before_semi"><font color="red">M</font></a>;
+}
+template<a title="8,sp_before_angle"><font color="red">M</font></a>&lt;<a title="9,90,sp_inside_angle"><font color="red">M</font></a>typename<a title="10,91,96,ADD from add_space_table"><font color="red">M</font></a>... A<a title="11,92,97,101,sp_before_comma"><font color="red">M</font></a>,<a title="12,93,98,102,105,sp_after_comma"><font color="red">M</font></a>int<a title="13,94,99,103,106,108,sp_type_ellipsis"><font color="red">M</font></a>... B<a title="14,95,100,104,107,109,110,sp_inside_angle"><font color="red">M</font></a>&gt;
+struct<a title="15,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="16,111,sp_after_type"><font color="red">M</font></a>:<a title="17,112,128,ADD from add_space_table"><font color="red">M</font></a>foo1<a title="18,113,129,144,sp_before_angle"><font color="red">M</font></a>&lt;<a title="19,114,130,145,159,sp_inside_angle"><font color="red">M</font></a>A<a title="20,115,131,146,160,173,sp_type_ellipsis"><font color="red">M</font></a>...<a title="21,116,132,147,161,174,186,sp_before_comma"><font color="red">M</font></a>,<a title="22,117,133,148,162,175,187,198,sp_after_comma"><font color="red">M</font></a>(<a title="23,118,134,149,163,176,188,199,209,sp_inside_paren"><font color="red">M</font></a>sizeof<a title="24,119,135,150,164,177,189,200,210,219,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="25,120,136,151,165,178,190,201,211,220,228,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="26,121,137,152,166,179,191,202,212,221,229,236,sp_inside_paren"><font color="red">M</font></a>A<a title="27,122,138,153,167,180,192,203,213,222,230,237,243,sp_inside_paren"><font color="red">M</font></a>)<a title="28,123,139,154,168,181,193,204,214,223,231,238,244,249,sp_arith"><font color="red">M</font></a>+<a title="29,124,140,155,169,182,194,205,215,224,232,239,245,250,254,sp_arith"><font color="red">M</font></a>B<a title="30,125,141,156,170,183,195,206,216,225,233,240,246,251,255,258,sp_inside_paren"><font color="red">M</font></a>)<a title="31,126,142,157,171,184,196,207,217,226,234,241,247,252,256,259,261,sp_paren_ellipsis"><font color="red">M</font></a>...<a title="32,127,143,158,172,185,197,208,218,227,235,242,248,253,257,260,262,263,sp_inside_angle"><font color="red">M</font></a>&gt;
+{
+   foo1<a title="33,51,sp_func_class_paren"><font color="red">M</font></a>(<a title="34,52,264,sp_inside_fparens"><font color="red">M</font></a>)<a title="35,53,265,266,sp_fparen_brace"><font color="red">M</font></a>{
+      int<a title="36,54,sp_after_type"><font color="red">M</font></a>x<a title="37,55,267,sp_assign"><font color="red">M</font></a>=<a title="38,56,268,274,sp_assign"><font color="red">M</font></a>sizeof<a title="39,57,269,275,280,sp_sizeof_ellipsis"><font color="red">M</font></a>...<a title="40,58,270,276,281,285,sp_sizeof_ellipsis_paren"><font color="red">M</font></a>(<a title="41,59,271,277,282,286,289,sp_inside_paren"><font color="red">M</font></a>A<a title="42,60,272,278,283,287,290,292,sp_inside_paren"><font color="red">M</font></a>)<a title="43,61,273,279,284,288,291,293,294,sp_before_semi"><font color="red">M</font></a>;
+      bool<a title="44,62,sp_after_type"><font color="red">M</font></a>b<a title="45,63,295,sp_assign"><font color="red">M</font></a>=<a title="46,64,296,300,sp_assign"><font color="red">M</font></a>x<a title="47,65,297,301,304,sp_compare"><font color="red">M</font></a>><a title="48,66,298,302,305,307,sp_compare"><font color="red">M</font></a>1<a title="49,67,299,303,306,308,309,sp_before_semi"><font color="red">M</font></a>;
+   }
+}<a title="50,sp_before_semi"><font color="red">M</font></a>;
+</pre>
+</body>
+</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/I-842.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/I-842.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/I-842.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/I-842.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/backup.h
index 210c6f7c..210c6f7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.csv b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.csv
new file mode 100644
index 00000000..3b5c4a4e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.csv
@@ -0,0 +1,685 @@
+number of loops,1,
+language,CPP,
+Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig Sp Before,Br,Lvl,pp,Flags,Nl Before,Nl After,Text,
+1,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,3,0,0,0,"",9,0," /**␤    * the enum (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * ""enum type [: integral_type] { ... } [x, ...]""␤    * ""enum type [: integral_type]""␤    * ""enum class type [: integral_type] { ... } [x, ...]""␤    * ""enum class type [: integral_type]""␤    * ""enum [: integral_type] { ... } x, ...""␤    */"
+10,NEWLINE,NONE,PARENT_NOT_SET,7,7,4,0,0,0,0,"",2,0,
+12,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,0,0,0,0,"",9,0," /**␤    * the class/struct (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }␤    * template<...> class/struct[<...>] [macros/attributes ...] type␤    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]␤    * class/struct [macros/attributes ...] type [x, ...]␤    * class/struct [macros/attributes ...] [: bases] { } x, ...␤    */"
+21,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0,
+23,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
+23,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,0,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
+23,MACRO_FUNC,NONE,PARENT_NOT_SET,9,9,16,1,1,1,0,"IN_PREPROC,EXPR_START",0,0,"         ALIGNAS"
+23,FPAREN_OPEN,MACRO_FUNC,PARENT_NOT_SET,16,16,17,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                ("
+23,WORD,NONE,PARENT_NOT_SET,17,17,31,0,1,2,0,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                 byte_alignment"
+23,FPAREN_CLOSE,MACRO_FUNC,PARENT_NOT_SET,31,31,32,0,1,1,0,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                               )"
+23,ATTRIBUTE,NONE,PARENT_NOT_SET,33,33,46,1,1,1,0,"IN_PREPROC",0,0,"                                 __attribute__"
+23,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,46,46,47,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                              ("
+23,PAREN_OPEN,NONE,PARENT_NOT_SET,47,47,48,0,1,2,0,"IN_PREPROC,EXPR_START,PUNCTUATOR",0,0,"                                               ("
+23,FUNC_CALL,NONE,PARENT_NOT_SET,48,48,55,0,1,3,0,"IN_PREPROC,EXPR_START",0,0,"                                                aligned"
+23,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,55,55,56,0,1,3,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                       ("
+23,WORD,NONE,PARENT_NOT_SET,56,56,70,0,1,4,0,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                                        byte_alignment"
+23,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,70,70,71,0,1,3,0,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                      )"
+23,PAREN_CLOSE,NONE,PARENT_NOT_SET,71,71,72,0,1,2,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                       )"
+23,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,72,72,73,0,1,1,0,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                        )"
+23,NEWLINE,NONE,PARENT_NOT_SET,73,73,1,0,0,0,0,"",2,0,
+25,PREPROC,PP_IF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
+25,PP_IF,NONE,PARENT_NOT_SET,2,2,4,0,0,0,1,"IN_PREPROC,FORCE_SPACE",0,0,"  if"
+25,PP_DEFINED,NONE,PARENT_NOT_SET,5,5,12,1,0,0,1,"IN_PREPROC,EXPR_START",0,0,"     defined"
+25,PAREN_OPEN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"             ("
+25,WORD,NONE,PARENT_NOT_SET,14,14,22,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"              __unix__"
+25,PAREN_CLOSE,NONE,PARENT_NOT_SET,22,22,23,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                      )"
+25,BOOL,NONE,PARENT_NOT_SET,24,24,26,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                        ||"
+25,PAREN_OPEN,NONE,PARENT_NOT_SET,27,27,28,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                           ("
+25,PP_DEFINED,NONE,PARENT_NOT_SET,28,28,35,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                            defined"
+25,PAREN_OPEN,NONE,PARENT_NOT_SET,36,36,37,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                    ("
+25,WORD,NONE,PARENT_NOT_SET,37,37,46,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                                     __APPLE__"
+25,PAREN_CLOSE,NONE,PARENT_NOT_SET,46,46,47,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                              )"
+25,BOOL,NONE,PARENT_NOT_SET,48,48,50,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                &&"
+25,PP_DEFINED,NONE,PARENT_NOT_SET,51,51,58,1,0,0,1,"IN_PREPROC",0,0,"                                                   defined"
+25,PAREN_OPEN,NONE,PARENT_NOT_SET,59,59,60,1,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                           ("
+25,WORD,NONE,PARENT_NOT_SET,60,60,68,0,0,0,1,"IN_PREPROC,EXPR_START",0,0,"                                                            __MACH__"
+25,PAREN_CLOSE,NONE,PARENT_NOT_SET,68,68,69,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                    )"
+25,PAREN_CLOSE,NONE,PARENT_NOT_SET,69,69,70,0,0,0,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                                     )"
+25,NEWLINE,NONE,PARENT_NOT_SET,70,70,1,0,0,0,1,"",1,0,
+26,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
+26,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
+26,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"         API_EXPORT"
+26,ATTRIBUTE,NONE,PARENT_NOT_SET,20,20,33,1,1,1,1,"IN_PREPROC,EXPR_START",0,0,"                    __attribute__"
+26,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,34,34,35,1,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,PUNCTUATOR",0,0,"                                  ("
+26,PAREN_OPEN,NONE,PARENT_NOT_SET,35,35,36,0,1,2,1,"IN_PREPROC,EXPR_START,PUNCTUATOR",0,0,"                                   ("
+26,FUNC_CALL,NONE,PARENT_NOT_SET,36,36,46,0,1,3,1,"IN_PREPROC,EXPR_START",0,0,"                                    visibility"
+26,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,46,46,47,0,1,3,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                              ("
+26,STRING,PP_INCLUDE,PARENT_NOT_SET,47,47,56,0,1,4,1,"IN_PREPROC,IN_FCN_CALL,EXPR_START",0,0,"                                               ""default"""
+26,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,56,56,57,0,1,3,1,"IN_PREPROC,IN_FCN_CALL,PUNCTUATOR",0,0,"                                                        )"
+26,PAREN_CLOSE,NONE,PARENT_NOT_SET,57,57,58,0,1,2,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                         )"
+26,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,58,58,59,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                                          )"
+26,NEWLINE,NONE,PARENT_NOT_SET,59,59,1,0,0,0,1,"",1,0,
+27,PREPROC,PP_ELSE,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
+27,PP_ELSE,NONE,PP_IF,2,2,6,0,0,0,1,"IN_PREPROC,FORCE_SPACE",0,0,"  elif"
+27,PP_DEFINED,NONE,PARENT_NOT_SET,7,7,14,1,0,0,1,"IN_PREPROC,FORCE_SPACE,EXPR_START",0,0,"       defined"
+27,WORD,NONE,PARENT_NOT_SET,15,15,21,1,0,0,1,"IN_PREPROC",0,0,"               _WIN32"
+27,NEWLINE,NONE,PARENT_NOT_SET,21,21,1,0,0,0,1,"",1,0,
+28,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
+28,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
+28,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"         API_EXPORT"
+28,DECLSPEC,NONE,PARENT_NOT_SET,20,20,30,1,1,1,1,"IN_PREPROC,STMT_START,EXPR_START",0,0,"                    __declspec"
+28,PAREN_OPEN,DECLSPEC,PARENT_NOT_SET,30,30,31,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                              ("
+28,WORD,NONE,PARENT_NOT_SET,31,31,40,0,1,2,1,"IN_PREPROC,EXPR_START",0,0,"                               dllexport"
+28,PAREN_CLOSE,DECLSPEC,PARENT_NOT_SET,40,40,41,0,1,1,1,"IN_PREPROC,PUNCTUATOR",0,0,"                                        )"
+28,NEWLINE,NONE,PARENT_NOT_SET,41,41,1,0,0,0,1,"",1,0,
+29,PREPROC,PP_ELSE,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
+29,PP_ELSE,NONE,PP_IF,2,2,6,0,0,0,1,"IN_PREPROC",0,0,"  else"
+29,NEWLINE,NONE,PARENT_NOT_SET,6,6,1,0,0,0,1,"",1,0,
+30,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,1,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #"
+30,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,1,"IN_PREPROC,FORCE_SPACE",0,0,"  define"
+30,MACRO,NONE,PARENT_NOT_SET,9,9,19,1,1,1,1,"IN_PREPROC",0,0,"         API_EXPORT"
+30,NEWLINE,NONE,PARENT_NOT_SET,19,19,1,0,0,0,1,"",1,0,
+31,PREPROC,PP_ENDIF,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_PREPROC,DONT_INDENT,PUNCTUATOR",0,0," #"
+31,PP_ENDIF,NONE,PP_IF,2,2,7,0,0,0,0,"IN_PREPROC",0,0,"  endif"
+31,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0,
+33,NAMESPACE,NONE,PARENT_NOT_SET,1,1,10,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," namespace"
+33,WORD,NAMESPACE,PARENT_NOT_SET,11,11,26,1,0,0,0,"",0,0,"           outer_namespace"
+33,NEWLINE,NONE,PARENT_NOT_SET,26,26,1,0,0,0,0,"",1,0,
+34,BRACE_OPEN,NAMESPACE,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," {"
+34,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_NAMESPACE",2,0,
+36,NAMESPACE,NONE,PARENT_NOT_SET,1,1,10,0,1,1,0,"IN_NAMESPACE,FORCE_SPACE,STMT_START,EXPR_START",0,0," namespace"
+36,WORD,NAMESPACE,PARENT_NOT_SET,11,11,26,1,1,1,0,"IN_NAMESPACE",0,0,"           inner_namespace"
+36,NEWLINE,NONE,PARENT_NOT_SET,26,26,1,0,1,1,0,"IN_NAMESPACE",1,0,
+37,BRACE_OPEN,NAMESPACE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_NAMESPACE,PUNCTUATOR",0,0," {"
+37,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,2,2,0,"IN_NAMESPACE",2,0,
+39,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,2,2,0,"IN_NAMESPACE,FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
+39,TYPE,CLASS,PARENT_NOT_SET,7,7,12,1,2,2,0,"IN_NAMESPACE",0,0,"       Base1"
+39,BRACE_OPEN,CLASS,PARENT_NOT_SET,13,13,14,1,2,2,0,"IN_CLASS,IN_NAMESPACE,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"             {"
+39,BRACE_CLOSE,CLASS,PARENT_NOT_SET,15,15,16,1,2,2,0,"IN_CLASS,IN_NAMESPACE,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"               }"
+39,SEMICOLON,CLASS,PARENT_NOT_SET,16,16,17,0,2,2,0,"PUNCTUATOR",0,0,"                ;"
+39,NEWLINE,NONE,PARENT_NOT_SET,17,17,1,0,2,2,0,"",2,0,
+41,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,2,2,0,"STMT_START,EXPR_START",0,0," template"
+41,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,2,2,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
+41,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,2,3,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
+41,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,18,18,19,0,2,2,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  >"
+41,CLASS,TEMPLATE,PARENT_NOT_SET,20,20,25,1,2,2,0,"FORCE_SPACE,EXPR_START",0,0,"                    class"
+41,TYPE,CLASS,PARENT_NOT_SET,26,26,31,1,2,2,0,"",0,0,"                          Base2"
+41,BRACE_OPEN,CLASS,PARENT_NOT_SET,32,32,33,1,2,2,0,"IN_CLASS,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"                                {"
+41,BRACE_CLOSE,CLASS,PARENT_NOT_SET,34,34,35,1,2,2,0,"IN_CLASS,ONE_LINER,EMPTY_BODY,PUNCTUATOR",0,0,"                                  }"
+41,SEMICOLON,CLASS,PARENT_NOT_SET,35,35,36,0,2,2,0,"PUNCTUATOR",0,0,"                                   ;"
+41,NEWLINE,NONE,PARENT_NOT_SET,36,36,1,0,2,2,0,"",2,0,
+43,BRACE_CLOSE,NAMESPACE,PARENT_NOT_SET,1,1,2,0,1,1,0,"PUNCTUATOR",0,0," }"
+43,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"",2,0,
+45,BRACE_CLOSE,NAMESPACE,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," }"
+45,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,0,0,0,"",2,0,
+47,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,82,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }"
+47,NEWLINE,NONE,PARENT_NOT_SET,82,82,1,0,0,0,0,"",1,0,
+48,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
+48,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
+48,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
+48,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
+48,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
+48,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
+48,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
+48,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
+49,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START",0,0," class"
+49,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
+49,ATTRIBUTE,NONE,PARENT_NOT_SET,18,18,31,1,0,0,0,"",0,0,"                  __attribute__"
+49,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,31,31,32,0,0,0,0,"PUNCTUATOR",0,0,"                               ("
+49,PAREN_OPEN,NONE,PARENT_NOT_SET,32,32,33,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                ("
+49,WORD,NONE,PARENT_NOT_SET,33,33,47,0,0,2,0,"EXPR_START",0,0,"                                 __deprecated__"
+49,PAREN_CLOSE,NONE,PARENT_NOT_SET,47,47,48,0,0,1,0,"PUNCTUATOR",0,0,"                                               )"
+49,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,48,48,49,0,0,0,0,"PUNCTUATOR",0,0,"                                                )"
+49,MACRO_FUNC_CALL,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"",0,0,"                                                  ALIGNAS"
+49,FPAREN_OPEN,MACRO_FUNC_CALL,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
+49,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"EXPR_START",0,0,"                                                          4"
+49,FPAREN_CLOSE,MACRO_FUNC_CALL,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
+49,TYPE,CLASS,PARENT_NOT_SET,61,61,63,1,0,0,0,"",0,0,"                                                             c1"
+49,NEWLINE,NONE,PARENT_NOT_SET,63,63,1,0,0,0,0,"",1,0,
+50,CLASS_COLON,CLASS,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"         :"
+50,QUALIFIER,NONE,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START",0,0,"           public"
+50,TYPE,NONE,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                  outer_namespace"
+50,DC_MEMBER,NONE,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                 ::"
+50,TYPE,NONE,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                   inner_namespace"
+50,DC_MEMBER,NONE,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                  ::"
+50,TYPE,NONE,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                    Base1"
+50,COMMA,NONE,PARENT_NOT_SET,57,49,50,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                         ,"
+50,NEWLINE,NONE,PARENT_NOT_SET,58,50,3,0,0,0,0,"",1,0,
+51,QUALIFIER,NONE,PARENT_NOT_SET,9,3,9,0,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,EXPR_START",0,0,"         public"
+51,TYPE,NONE,PARENT_NOT_SET,16,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                outer_namespace"
+51,DC_MEMBER,NONE,PARENT_NOT_SET,31,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                               ::"
+51,TYPE,NONE,PARENT_NOT_SET,33,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                 inner_namespace"
+51,DC_MEMBER,NONE,PARENT_NOT_SET,48,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                ::"
+51,TYPE,NONE,PARENT_NOT_SET,50,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                  Base2"
+51,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,55,49,50,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                       <"
+51,TYPE,NONE,PARENT_NOT_SET,56,50,65,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                                                        outer_namespace"
+51,DC_MEMBER,NONE,PARENT_NOT_SET,71,65,67,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                                       ::"
+51,TYPE,NONE,PARENT_NOT_SET,73,67,82,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE",0,0,"                                                                         inner_namespace"
+51,DC_MEMBER,NONE,PARENT_NOT_SET,88,82,84,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                                                        ::"
+51,TYPE,NONE,PARENT_NOT_SET,90,84,89,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE",0,0,"                                                                                          Base1"
+51,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,95,89,90,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                                                               >"
+51,NEWLINE,NONE,PARENT_NOT_SET,96,90,1,0,0,0,0,"",1,0,
+52,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EXPR_START,EMPTY_BODY,PUNCTUATOR",0,0," {"
+52,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",2,0,
+54,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0," }"
+54,SEMICOLON,CLASS,PARENT_NOT_SET,2,2,3,0,0,0,0,"PUNCTUATOR",0,0,"  ;"
+54,NEWLINE,NONE,PARENT_NOT_SET,3,3,1,0,0,0,0,"",2,0,
+56,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,70,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type { }"
+56,NEWLINE,NONE,PARENT_NOT_SET,70,70,1,0,0,0,0,"",1,0,
+57,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
+57,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
+57,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
+57,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
+57,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
+57,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
+57,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
+57,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
+58,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START",0,0," class"
+58,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
+58,TYPE,CLASS,PARENT_NOT_SET,18,18,20,1,0,0,0,"",0,0,"                  c2"
+58,NEWLINE,NONE,PARENT_NOT_SET,20,20,1,0,0,0,0,"",1,0,
+59,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," {"
+59,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",1,0,
+60,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
+60,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
+60,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"IN_CLASS",2,0,
+62,TEMPLATE,NONE,PARENT_NOT_SET,1,4,12,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," template"
+62,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,12,13,0,1,1,0,"IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"         <"
+62,TYPENAME,NONE,PARENT_NOT_SET,10,13,21,0,1,2,0,"IN_TEMPLATE,IN_CLASS,FORCE_SPACE,EXPR_START",0,0,"          typename"
+62,TYPE,NONE,PARENT_NOT_SET,19,22,23,1,1,2,0,"IN_TEMPLATE,IN_CLASS",0,0,"                   T"
+62,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,20,23,24,0,1,1,0,"IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                    >"
+62,NEWLINE,NONE,PARENT_NOT_SET,21,24,4,0,1,1,0,"IN_CLASS",1,0,
+63,STRUCT,TEMPLATE,PARENT_NOT_SET,1,4,10,0,1,1,0,"IN_CLASS,FORCE_SPACE,EXPR_START",0,0," struct"
+63,TYPE,STRUCT,PARENT_NOT_SET,8,11,22,1,1,1,0,"IN_CLASS",0,0,"        inner_class"
+63,NEWLINE,NONE,PARENT_NOT_SET,19,22,4,0,1,1,0,"IN_CLASS",1,0,
+64,BRACE_OPEN,STRUCT,PARENT_NOT_SET,1,4,5,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0," {"
+64,NEWLINE,NONE,PARENT_NOT_SET,2,5,7,0,2,2,0,"IN_STRUCT,IN_CLASS",1,0,
+65,QUALIFIER,NONE,PARENT_NOT_SET,9,7,13,0,2,2,0,"IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0,"         static"
+65,TYPE,NONE,PARENT_NOT_SET,16,14,25,1,2,2,0,"IN_STRUCT,IN_CLASS,VAR_TYPE",0,0,"                inner_class"
+65,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,27,25,26,0,2,2,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                           <"
+65,TYPE,NONE,PARENT_NOT_SET,28,26,27,0,2,3,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,EXPR_START",0,0,"                            T"
+65,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,29,27,28,0,2,2,0,"IN_STRUCT,IN_TEMPLATE,IN_CLASS,PUNCTUATOR",0,0,"                             >"
+65,PTR_TYPE,NONE,PARENT_NOT_SET,31,29,30,1,2,2,0,"IN_STRUCT,IN_CLASS,EXPR_START,VAR_TYPE,PUNCTUATOR",0,0,"                               *"
+65,WORD,NONE,PARENT_NOT_SET,32,30,43,0,2,2,0,"IN_STRUCT,IN_CLASS,EXPR_START,VAR_DEF,VAR_1ST",0,0,"                                m_inner_class"
+65,SEMICOLON,NONE,PARENT_NOT_SET,45,43,44,0,2,2,0,"IN_STRUCT,IN_CLASS,PUNCTUATOR",0,0,"                                             ;"
+65,NEWLINE,NONE,PARENT_NOT_SET,46,44,4,0,2,2,0,"IN_STRUCT,IN_CLASS",1,0,
+66,BRACE_CLOSE,STRUCT,PARENT_NOT_SET,1,4,5,0,1,1,0,"IN_STRUCT,IN_CLASS,PUNCTUATOR",0,0," }"
+66,SEMICOLON,STRUCT,PARENT_NOT_SET,2,5,6,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"  ;"
+66,NEWLINE,NONE,PARENT_NOT_SET,3,6,1,0,1,1,0,"IN_CLASS",1,0,
+67,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
+67,SEMICOLON,CLASS,PARENT_NOT_SET,2,2,3,0,0,0,0,"PUNCTUATOR",0,0,"  ;"
+67,NEWLINE,NONE,PARENT_NOT_SET,3,3,1,0,0,0,0,"",2,0,
+69,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
+69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
+69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,10,10,11,0,0,0,0,"IN_TEMPLATE,EXPR_START,PUNCTUATOR",0,0,"          >"
+69,TEMPLATE,NONE,PARENT_NOT_SET,12,12,20,1,0,0,0,"EXPR_START",0,0,"            template"
+69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,20,20,21,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                    <"
+69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,21,21,22,0,0,0,0,"IN_TEMPLATE,EXPR_START,PUNCTUATOR",0,0,"                     >"
+69,STRUCT,TEMPLATE,PARENT_NOT_SET,23,23,29,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                       struct"
+69,WORD,NONE,PARENT_NOT_SET,30,30,40,1,0,0,0,"FORCE_SPACE",0,0,"                              API_EXPORT"
+69,TYPE,NONE,PARENT_NOT_SET,41,41,43,1,0,0,0,"",0,0,"                                         c2"
+69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,43,43,44,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                           <"
+69,TYPE,NONE,PARENT_NOT_SET,44,44,47,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                            int"
+69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,47,47,48,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                               >"
+69,DC_MEMBER,NONE,PARENT_NOT_SET,48,48,50,0,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                ::"
+69,TYPE,STRUCT,PARENT_NOT_SET,50,50,61,0,0,0,0,"VAR_TYPE",0,0,"                                                  inner_class"
+69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,61,61,62,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                             <"
+69,TYPE,NONE,PARENT_NOT_SET,62,62,65,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                                              int"
+69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,65,65,66,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                 >"
+69,PTR_TYPE,NONE,PARENT_NOT_SET,67,67,68,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                   *"
+69,TYPE,NONE,PARENT_NOT_SET,68,68,70,0,0,0,0,"EXPR_START",0,0,"                                                                    c2"
+69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,70,70,71,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                      <"
+69,TYPE,NONE,PARENT_NOT_SET,71,71,74,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                                                       int"
+69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,74,74,75,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                          >"
+69,DC_MEMBER,NONE,PARENT_NOT_SET,75,75,77,0,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                           ::"
+69,TYPE,NONE,PARENT_NOT_SET,77,77,88,0,0,0,0,"",0,0,"                                                                             inner_class"
+69,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,88,88,89,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                                        <"
+69,TYPE,NONE,PARENT_NOT_SET,89,89,92,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                                                                                         int"
+69,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,92,92,93,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                                                                            >"
+69,DC_MEMBER,NONE,PARENT_NOT_SET,93,93,95,0,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                             ::"
+69,WORD,NONE,PARENT_NOT_SET,95,95,108,0,0,0,0,"VAR_DEF,VAR_1ST,LVALUE",0,0,"                                                                                               m_inner_class"
+69,ASSIGN,NONE,PARENT_NOT_SET,109,109,110,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                                             ="
+69,WORD,NONE,PARENT_NOT_SET,111,111,118,1,0,0,0,"EXPR_START",0,0,"                                                                                                               nullptr"
+69,SEMICOLON,STRUCT,PARENT_NOT_SET,118,118,119,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                      ;"
+69,NEWLINE,NONE,PARENT_NOT_SET,119,119,1,0,0,0,0,"",2,0,
+71,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,66,0,0,0,0,"",0,0," // template<...> class/struct[<...>] [macros/attributes ...] type"
+71,NEWLINE,NONE,PARENT_NOT_SET,66,66,1,0,0,0,0,"",1,0,
+72,TEMPLATE,NONE,PARENT_NOT_SET,1,1,9,0,0,0,0,"STMT_START,EXPR_START",0,0," template"
+72,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,9,9,10,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"         <"
+72,TYPENAME,NONE,PARENT_NOT_SET,10,10,18,0,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"          typename"
+72,COMMA,NONE,PARENT_NOT_SET,18,18,19,0,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                  ,"
+72,TYPENAME,NONE,PARENT_NOT_SET,20,20,28,1,0,1,0,"IN_TEMPLATE,EXPR_START",0,0,"                    typename"
+72,ELLIPSIS,NONE,PARENT_NOT_SET,29,29,32,1,0,1,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                             ..."
+72,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,32,32,33,0,0,0,0,"IN_TEMPLATE,PUNCTUATOR",0,0,"                                >"
+72,NEWLINE,NONE,PARENT_NOT_SET,33,33,1,0,0,0,0,"",1,0,
+73,CLASS,TEMPLATE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,EXPR_START,INCOMPLETE",0,0," class"
+73,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"       API_EXPORT"
+73,TYPE,CLASS,PARENT_NOT_SET,18,18,20,1,0,0,0,"INCOMPLETE",0,0,"                  c2"
+73,SEMICOLON,CLASS,PARENT_NOT_SET,20,20,21,0,0,0,0,"PUNCTUATOR",0,0,"                    ;"
+73,NEWLINE,NONE,PARENT_NOT_SET,21,21,1,0,0,0,0,"",2,0,
+75,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,68,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type : bases ... { } x, ..."
+75,NEWLINE,NONE,PARENT_NOT_SET,68,68,1,0,0,0,0,"",1,0,
+76,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
+76,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
+76,ATTRIBUTE,NONE,PARENT_NOT_SET,18,18,31,1,0,0,0,"",0,0,"                  __attribute__"
+76,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,31,31,32,0,0,0,0,"PUNCTUATOR",0,0,"                               ("
+76,PAREN_OPEN,NONE,PARENT_NOT_SET,32,32,33,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                ("
+76,WORD,NONE,PARENT_NOT_SET,33,33,47,0,0,2,0,"EXPR_START",0,0,"                                 __deprecated__"
+76,PAREN_CLOSE,NONE,PARENT_NOT_SET,47,47,48,0,0,1,0,"PUNCTUATOR",0,0,"                                               )"
+76,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,48,48,49,0,0,0,0,"PUNCTUATOR",0,0,"                                                )"
+76,MACRO_FUNC_CALL,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"",0,0,"                                                  ALIGNAS"
+76,FPAREN_OPEN,MACRO_FUNC_CALL,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
+76,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"EXPR_START",0,0,"                                                          4"
+76,FPAREN_CLOSE,MACRO_FUNC_CALL,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
+76,TYPE,CLASS,PARENT_NOT_SET,61,61,63,1,0,0,0,"VAR_TYPE",0,0,"                                                             c3"
+76,NEWLINE,NONE,PARENT_NOT_SET,63,63,1,0,0,0,0,"",1,0,
+77,CLASS_COLON,CLASS,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"         :"
+77,QUALIFIER,NONE,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START",0,0,"           public"
+77,TYPE,NONE,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                  outer_namespace"
+77,DC_MEMBER,NONE,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                 ::"
+77,TYPE,NONE,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                   inner_namespace"
+77,DC_MEMBER,NONE,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                  ::"
+77,TYPE,NONE,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                    Base2"
+77,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,57,49,50,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                         <"
+77,TYPE,NONE,PARENT_NOT_SET,58,50,53,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                                                          int"
+77,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,61,53,54,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                             >"
+77,COMMA,NONE,PARENT_NOT_SET,62,54,55,0,0,0,0,"IN_CLASS_BASE,EXPR_START,PUNCTUATOR",0,0,"                                                              ,"
+77,NEWLINE,NONE,PARENT_NOT_SET,63,55,3,0,0,0,0,"",1,0,
+78,QUALIFIER,NONE,PARENT_NOT_SET,9,3,9,0,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,EXPR_START",0,0,"         public"
+78,TYPE,NONE,PARENT_NOT_SET,16,10,12,1,0,0,0,"IN_CLASS_BASE",0,0,"                c2"
+78,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,18,12,13,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                  <"
+78,TYPE,NONE,PARENT_NOT_SET,19,13,16,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                   int"
+78,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,22,16,17,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                      >"
+78,DC_MEMBER,NONE,PARENT_NOT_SET,23,17,19,0,0,0,0,"IN_CLASS_BASE,EXPR_START,PUNCTUATOR",0,0,"                       ::"
+78,TYPE,NONE,PARENT_NOT_SET,25,19,30,0,0,0,0,"IN_CLASS_BASE",0,0,"                         inner_class"
+78,ANGLE_OPEN,TEMPLATE,PARENT_NOT_SET,36,30,31,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                    <"
+78,TYPE,NONE,PARENT_NOT_SET,37,31,34,0,0,1,0,"IN_TEMPLATE,IN_CLASS_BASE,EXPR_START",0,0,"                                     int"
+78,ANGLE_CLOSE,TEMPLATE,PARENT_NOT_SET,40,34,35,0,0,0,0,"IN_TEMPLATE,IN_CLASS_BASE,PUNCTUATOR",0,0,"                                        >"
+78,NEWLINE,NONE,PARENT_NOT_SET,41,35,1,0,0,0,0,"",1,0,
+79,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,EXPR_START,PUNCTUATOR",0,0," {"
+79,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",1,0,
+80,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
+80,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
+80,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"IN_CLASS",1,0,
+81,FUNC_CLASS_DEF,NONE,PARENT_NOT_SET,1,4,6,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," c3"
+81,FPAREN_OPEN,FUNC_CLASS_DEF,PARENT_NOT_SET,3,6,7,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"   ("
+81,TYPE,NONE,PARENT_NOT_SET,4,7,10,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE,LVALUE",0,0,"    int"
+81,WORD,NONE,PARENT_NOT_SET,8,11,12,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF,LVALUE",0,0,"        x"
+81,ASSIGN_DEFAULT_ARG,FUNC_PROTO,PARENT_NOT_SET,10,13,14,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"          ="
+81,NUMBER,NONE,PARENT_NOT_SET,12,15,16,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"            0"
+81,COMMA,NONE,PARENT_NOT_SET,13,16,17,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"             ,"
+81,TYPE,NONE,PARENT_NOT_SET,15,18,21,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE,LVALUE",0,0,"               int"
+81,WORD,NONE,PARENT_NOT_SET,19,22,23,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF,LVALUE",0,0,"                   y"
+81,ASSIGN_DEFAULT_ARG,FUNC_PROTO,PARENT_NOT_SET,21,24,25,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                     ="
+81,NUMBER,NONE,PARENT_NOT_SET,23,26,27,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                       0"
+81,COMMA,NONE,PARENT_NOT_SET,24,27,28,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                        ,"
+81,TYPE,NONE,PARENT_NOT_SET,26,29,32,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE,LVALUE",0,0,"                          int"
+81,WORD,NONE,PARENT_NOT_SET,30,33,34,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF,LVALUE",0,0,"                              z"
+81,ASSIGN_DEFAULT_ARG,FUNC_PROTO,PARENT_NOT_SET,32,35,36,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                ="
+81,NUMBER,NONE,PARENT_NOT_SET,34,37,38,1,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                  0"
+81,FPAREN_CLOSE,FUNC_CLASS_DEF,PARENT_NOT_SET,35,38,39,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                   )"
+81,CONSTR_COLON,NONE,PARENT_NOT_SET,37,40,41,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                     :"
+81,FUNC_CTOR_VAR,NONE,PARENT_NOT_SET,39,42,45,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START",0,0,"                                       m_x"
+81,FPAREN_OPEN,FUNC_CTOR_VAR,PARENT_NOT_SET,42,45,46,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                          ("
+81,WORD,NONE,PARENT_NOT_SET,43,46,47,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                           x"
+81,FPAREN_CLOSE,FUNC_CTOR_VAR,PARENT_NOT_SET,44,47,48,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                            )"
+81,COMMA,NONE,PARENT_NOT_SET,45,48,49,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                             ,"
+81,FUNC_CTOR_VAR,NONE,PARENT_NOT_SET,47,50,53,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                               m_y"
+81,FPAREN_OPEN,FUNC_CTOR_VAR,PARENT_NOT_SET,50,53,54,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                  ("
+81,WORD,NONE,PARENT_NOT_SET,51,54,55,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                                   y"
+81,FPAREN_CLOSE,FUNC_CTOR_VAR,PARENT_NOT_SET,52,55,56,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                    )"
+81,COMMA,NONE,PARENT_NOT_SET,53,56,57,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                     ,"
+81,FUNC_CTOR_VAR,NONE,PARENT_NOT_SET,55,58,61,1,1,1,0,"IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                                       m_z"
+81,FPAREN_OPEN,FUNC_CTOR_VAR,PARENT_NOT_SET,58,61,62,0,1,1,0,"IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                          ("
+81,WORD,NONE,PARENT_NOT_SET,59,62,63,0,1,2,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START",0,0,"                                                           z"
+81,FPAREN_CLOSE,FUNC_CTOR_VAR,PARENT_NOT_SET,60,63,64,0,1,1,0,"IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR",0,0,"                                                            )"
+81,BRACE_OPEN,FUNC_CLASS_DEF,PARENT_NOT_SET,62,65,66,1,1,1,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0,"                                                              {"
+81,NEWLINE,NONE,PARENT_NOT_SET,63,67,0,0,1,1,0,"IN_CLASS",1,0,
+81,BRACE_CLOSE,FUNC_CLASS_DEF,PARENT_NOT_SET,1,67,68,1,1,1,0,"IN_CLASS,EMPTY_BODY,PUNCTUATOR",0,0," }"
+81,NEWLINE,NONE,PARENT_NOT_SET,2,68,4,0,1,1,0,"IN_CLASS",2,0,
+83,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
+83,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_x"
+83,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
+83,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
+84,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
+84,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_y"
+84,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
+84,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
+85,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
+85,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_z"
+85,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
+85,NEWLINE,NONE,PARENT_NOT_SET,9,12,1,0,1,1,0,"IN_CLASS",1,0,
+86,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
+86,WORD,NONE,PARENT_NOT_SET,3,3,6,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"   c31"
+86,COMMA,NONE,PARENT_NOT_SET,6,6,7,0,0,0,0,"PUNCTUATOR",0,0,"      ,"
+86,PTR_TYPE,CLASS,PARENT_NOT_SET,8,8,9,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"        *"
+86,WORD,NONE,PARENT_NOT_SET,9,9,12,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"         c32"
+86,ASSIGN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,0,"PUNCTUATOR",0,0,"             ="
+86,WORD,NONE,PARENT_NOT_SET,15,15,22,1,0,0,0,"EXPR_START",0,0,"               nullptr"
+86,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ,"
+86,PTR_TYPE,CLASS,PARENT_NOT_SET,24,24,25,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                        *"
+86,WORD,NONE,PARENT_NOT_SET,25,25,28,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                         c33"
+86,TSQUARE,NONE,PARENT_NOT_SET,28,28,30,0,0,0,0,"PUNCTUATOR",0,0,"                            []"
+86,ASSIGN,NONE,PARENT_NOT_SET,31,31,32,1,0,0,0,"PUNCTUATOR",0,0,"                               ="
+86,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,33,33,34,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                 {"
+86,WORD,NONE,PARENT_NOT_SET,35,35,42,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                   nullptr"
+86,COMMA,NONE,PARENT_NOT_SET,42,42,43,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                          ,"
+86,WORD,NONE,PARENT_NOT_SET,44,44,51,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                            nullptr"
+86,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,52,52,53,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                    }"
+86,COMMA,NONE,PARENT_NOT_SET,53,53,54,0,0,0,0,"PUNCTUATOR",0,0,"                                                     ,"
+86,WORD,NONE,PARENT_NOT_SET,55,55,58,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"                                                       c34"
+86,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,58,58,59,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                          {"
+86,NUMBER,NONE,PARENT_NOT_SET,60,60,61,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                            0"
+86,COMMA,NONE,PARENT_NOT_SET,61,61,62,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                             ,"
+86,NUMBER,NONE,PARENT_NOT_SET,63,63,64,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                               1"
+86,COMMA,NONE,PARENT_NOT_SET,64,64,65,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                ,"
+86,NUMBER,NONE,PARENT_NOT_SET,66,66,67,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                  2"
+86,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,67,67,68,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                   }"
+86,COMMA,NONE,PARENT_NOT_SET,68,68,69,0,0,0,0,"PUNCTUATOR",0,0,"                                                                    ,"
+86,PTR_TYPE,CLASS,PARENT_NOT_SET,70,70,71,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                      *"
+86,QUALIFIER,NONE,PARENT_NOT_SET,72,72,77,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                                                                        const"
+86,FUNC_CALL,NONE,PARENT_NOT_SET,78,78,81,1,0,0,0,"VAR_DEF,VAR_INLINE",0,0,"                                                                              c35"
+86,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,81,81,82,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                 ("
+86,WORD,NONE,PARENT_NOT_SET,82,82,89,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                  nullptr"
+86,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,89,89,90,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                         )"
+86,COMMA,NONE,PARENT_NOT_SET,90,90,91,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                          ,"
+86,FUNC_CALL,NONE,PARENT_NOT_SET,92,92,95,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                                                            c16"
+86,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,95,95,96,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                               ("
+86,NUMBER,NONE,PARENT_NOT_SET,96,96,97,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                0"
+86,COMMA,NONE,PARENT_NOT_SET,97,97,98,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                 ,"
+86,NUMBER,NONE,PARENT_NOT_SET,99,99,100,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                   1"
+86,COMMA,NONE,PARENT_NOT_SET,100,100,101,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                    ,"
+86,NUMBER,NONE,PARENT_NOT_SET,102,102,103,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                      2"
+86,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,103,103,104,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                       )"
+86,SEMICOLON,CLASS,PARENT_NOT_SET,104,104,105,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                        ;"
+86,NEWLINE,NONE,PARENT_NOT_SET,105,105,1,0,0,0,0,"",2,0,
+88,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,52,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type x, ..."
+88,NEWLINE,NONE,PARENT_NOT_SET,52,52,1,0,0,0,0,"",1,0,
+89,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
+89,ATTRIBUTE,NONE,PARENT_NOT_SET,7,7,20,1,0,0,0,"",0,0,"       __attribute__"
+89,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,20,20,21,0,0,0,0,"PUNCTUATOR",0,0,"                    ("
+89,PAREN_OPEN,NONE,PARENT_NOT_SET,21,21,22,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                     ("
+89,WORD,NONE,PARENT_NOT_SET,22,22,36,0,0,2,0,"EXPR_START",0,0,"                      __deprecated__"
+89,PAREN_CLOSE,NONE,PARENT_NOT_SET,36,36,37,0,0,1,0,"PUNCTUATOR",0,0,"                                    )"
+89,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,37,37,38,0,0,0,0,"PUNCTUATOR",0,0,"                                     )"
+89,WORD,NONE,PARENT_NOT_SET,39,39,49,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                                       API_EXPORT"
+89,MACRO_FUNC_CALL,NONE,PARENT_NOT_SET,50,50,57,1,0,0,0,"",0,0,"                                                  ALIGNAS"
+89,FPAREN_OPEN,MACRO_FUNC_CALL,PARENT_NOT_SET,57,57,58,0,0,0,0,"PUNCTUATOR",0,0,"                                                         ("
+89,NUMBER,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"EXPR_START",0,0,"                                                          4"
+89,FPAREN_CLOSE,MACRO_FUNC_CALL,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
+89,TYPE,CLASS,PARENT_NOT_SET,61,61,63,1,0,0,0,"FORCE_SPACE,VAR_TYPE",0,0,"                                                             c3"
+89,WORD,NONE,PARENT_NOT_SET,64,64,67,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                                                                c41"
+89,COMMA,NONE,PARENT_NOT_SET,67,67,68,0,0,0,0,"PUNCTUATOR",0,0,"                                                                   ,"
+89,PTR_TYPE,CLASS,PARENT_NOT_SET,69,69,70,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                     *"
+89,WORD,NONE,PARENT_NOT_SET,70,70,73,0,0,0,0,"EXPR_START,VAR_DEF,LVALUE",0,0,"                                                                      c42"
+89,ASSIGN,NONE,PARENT_NOT_SET,74,74,75,1,0,0,0,"PUNCTUATOR",0,0,"                                                                          ="
+89,WORD,NONE,PARENT_NOT_SET,76,76,79,1,0,0,0,"EXPR_START",0,0,"                                                                            c32"
+89,QUESTION,NONE,PARENT_NOT_SET,80,80,81,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                ?"
+89,WORD,NONE,PARENT_NOT_SET,82,82,85,1,0,0,0,"EXPR_START",0,0,"                                                                                  c32"
+89,COND_COLON,NONE,PARENT_NOT_SET,86,86,87,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                      :"
+89,WORD,NONE,PARENT_NOT_SET,88,88,95,1,0,0,0,"STMT_START,EXPR_START",0,0,"                                                                                        nullptr"
+89,COMMA,NONE,PARENT_NOT_SET,95,95,96,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                               ,"
+89,PTR_TYPE,CLASS,PARENT_NOT_SET,97,97,98,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                                 *"
+89,WORD,NONE,PARENT_NOT_SET,98,98,101,0,0,0,0,"EXPR_START,VAR_DEF",0,0,"                                                                                                  c43"
+89,TSQUARE,NONE,PARENT_NOT_SET,101,101,103,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                     []"
+89,ASSIGN,NONE,PARENT_NOT_SET,104,104,105,1,0,0,0,"PUNCTUATOR",0,0,"                                                                                                        ="
+89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,106,106,107,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                                                                                          {"
+89,WORD,NONE,PARENT_NOT_SET,108,108,115,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                            nullptr"
+89,COMMA,NONE,PARENT_NOT_SET,115,115,116,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                   ,"
+89,WORD,NONE,PARENT_NOT_SET,117,117,124,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                     nullptr"
+89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,125,125,126,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                             }"
+89,COMMA,NONE,PARENT_NOT_SET,126,126,127,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                              ,"
+89,WORD,NONE,PARENT_NOT_SET,128,128,131,1,0,0,0,"EXPR_START,VAR_DEF,LVALUE",0,0,"                                                                                                                                c44"
+89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,131,131,132,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                   {"
+89,NUMBER,NONE,PARENT_NOT_SET,133,133,134,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                                                                                                     0"
+89,COMMA,NONE,PARENT_NOT_SET,134,134,135,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                      ,"
+89,NUMBER,NONE,PARENT_NOT_SET,136,136,137,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                                        1"
+89,COMMA,NONE,PARENT_NOT_SET,137,137,138,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                         ,"
+89,NUMBER,NONE,PARENT_NOT_SET,139,139,140,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                                                                                                                           2"
+89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,140,140,141,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                                                                                            }"
+89,COMMA,NONE,PARENT_NOT_SET,141,141,142,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                             ,"
+89,PTR_TYPE,CLASS,PARENT_NOT_SET,143,143,144,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                                                                                                               *"
+89,QUALIFIER,NONE,PARENT_NOT_SET,145,145,150,1,0,0,0,"FORCE_SPACE,EXPR_START",0,0,"                                                                                                                                                 const"
+89,FUNC_CALL,NONE,PARENT_NOT_SET,151,151,154,1,0,0,0,"VAR_DEF",0,0,"                                                                                                                                                       c45"
+89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,154,154,155,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                          ("
+89,WORD,NONE,PARENT_NOT_SET,155,155,162,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                           nullptr"
+89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,162,162,163,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                  )"
+89,COMMA,NONE,PARENT_NOT_SET,163,163,164,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                   ,"
+89,FUNC_CALL,NONE,PARENT_NOT_SET,165,165,168,1,0,0,0,"EXPR_START,VAR_DEF",0,0,"                                                                                                                                                                     c46"
+89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,168,168,169,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                        ("
+89,NUMBER,NONE,PARENT_NOT_SET,169,169,170,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                         0"
+89,COMMA,NONE,PARENT_NOT_SET,170,170,171,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                          ,"
+89,NUMBER,NONE,PARENT_NOT_SET,172,172,173,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                            1"
+89,COMMA,NONE,PARENT_NOT_SET,173,173,174,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                             ,"
+89,NUMBER,NONE,PARENT_NOT_SET,175,175,176,1,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"                                                                                                                                                                               2"
+89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,176,176,177,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                                                                                                                                                                                )"
+89,SEMICOLON,CLASS,PARENT_NOT_SET,177,177,178,0,0,0,0,"PUNCTUATOR",0,0,"                                                                                                                                                                                 ;"
+89,NEWLINE,NONE,PARENT_NOT_SET,178,178,1,0,0,0,0,"",2,0,
+91,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,68,0,0,0,0,"",0,0," // class/struct [macros/attributes ...] type : bases ... { } x, ..."
+91,NEWLINE,NONE,PARENT_NOT_SET,68,68,1,0,0,0,0,"",1,0,
+92,CLASS,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," class"
+92,FUNC_CALL,NONE,PARENT_NOT_SET,7,7,14,1,0,0,0,"",0,0,"       ALIGNAS"
+92,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,14,14,15,0,0,0,0,"PUNCTUATOR",0,0,"              ("
+92,NUMBER,NONE,PARENT_NOT_SET,15,15,16,0,0,1,0,"IN_FCN_CALL,EXPR_START",0,0,"               4"
+92,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,16,16,17,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR",0,0,"                )"
+92,WORD,NONE,PARENT_NOT_SET,18,18,28,1,0,0,0,"FORCE_SPACE",0,0,"                  API_EXPORT"
+92,ATTRIBUTE,NONE,PARENT_NOT_SET,29,29,42,1,0,0,0,"",0,0,"                             __attribute__"
+92,FPAREN_OPEN,ATTRIBUTE,PARENT_NOT_SET,42,42,43,0,0,0,0,"PUNCTUATOR",0,0,"                                          ("
+92,PAREN_OPEN,NONE,PARENT_NOT_SET,43,43,44,0,0,1,0,"EXPR_START,PUNCTUATOR",0,0,"                                           ("
+92,WORD,NONE,PARENT_NOT_SET,44,44,58,0,0,2,0,"EXPR_START",0,0,"                                            __deprecated__"
+92,PAREN_CLOSE,NONE,PARENT_NOT_SET,58,58,59,0,0,1,0,"PUNCTUATOR",0,0,"                                                          )"
+92,FPAREN_CLOSE,ATTRIBUTE,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           )"
+92,NEWLINE,NONE,PARENT_NOT_SET,60,60,1,0,0,0,0,"",1,0,
+93,CLASS_COLON,CLASS,PARENT_NOT_SET,9,1,2,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"         :"
+93,QUALIFIER,NONE,PARENT_NOT_SET,11,3,9,1,0,0,0,"IN_CLASS_BASE,FORCE_SPACE,STMT_START,EXPR_START",0,0,"           public"
+93,TYPE,NONE,PARENT_NOT_SET,18,10,25,1,0,0,0,"IN_CLASS_BASE",0,0,"                  outer_namespace"
+93,DC_MEMBER,NONE,PARENT_NOT_SET,33,25,27,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                 ::"
+93,TYPE,NONE,PARENT_NOT_SET,35,27,42,0,0,0,0,"IN_CLASS_BASE",0,0,"                                   inner_namespace"
+93,DC_MEMBER,NONE,PARENT_NOT_SET,50,42,44,0,0,0,0,"IN_CLASS_BASE,PUNCTUATOR",0,0,"                                                  ::"
+93,TYPE,NONE,PARENT_NOT_SET,52,44,49,0,0,0,0,"IN_CLASS_BASE",0,0,"                                                    Base1"
+93,NEWLINE,NONE,PARENT_NOT_SET,57,49,1,0,0,0,0,"",1,0,
+94,BRACE_OPEN,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"PUNCTUATOR",0,0," {"
+94,NEWLINE,NONE,PARENT_NOT_SET,2,2,1,0,1,1,0,"IN_CLASS",1,0,
+95,ACCESS,NONE,PARENT_NOT_SET,1,1,7,0,1,1,0,"IN_CLASS,STMT_START,EXPR_START",0,0," public"
+95,ACCESS_COLON,NONE,PARENT_NOT_SET,7,7,8,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"       :"
+95,NEWLINE,NONE,PARENT_NOT_SET,8,8,4,0,1,1,0,"IN_CLASS",1,0,
+96,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
+96,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_x"
+96,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
+96,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
+97,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
+97,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_y"
+97,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
+97,NEWLINE,NONE,PARENT_NOT_SET,9,12,4,0,1,1,0,"IN_CLASS",1,0,
+98,TYPE,NONE,PARENT_NOT_SET,1,4,7,0,1,1,0,"IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE",0,0," int"
+98,WORD,NONE,PARENT_NOT_SET,5,8,11,1,1,1,0,"IN_CLASS,VAR_DEF,VAR_1ST",0,0,"     m_z"
+98,SEMICOLON,NONE,PARENT_NOT_SET,8,11,12,0,1,1,0,"IN_CLASS,PUNCTUATOR",0,0,"        ;"
+98,NEWLINE,NONE,PARENT_NOT_SET,9,12,1,0,1,1,0,"IN_CLASS",1,0,
+99,BRACE_CLOSE,CLASS,PARENT_NOT_SET,1,1,2,0,0,0,0,"IN_CLASS,PUNCTUATOR",0,0," }"
+99,WORD,NONE,PARENT_NOT_SET,3,3,6,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"   c51"
+99,COMMA,NONE,PARENT_NOT_SET,6,6,7,0,0,0,0,"PUNCTUATOR",0,0,"      ,"
+99,PTR_TYPE,CLASS,PARENT_NOT_SET,8,8,9,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"        *"
+99,WORD,NONE,PARENT_NOT_SET,9,9,12,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"         c52"
+99,ASSIGN,NONE,PARENT_NOT_SET,13,13,14,1,0,0,0,"PUNCTUATOR",0,0,"             ="
+99,WORD,NONE,PARENT_NOT_SET,15,15,22,1,0,0,0,"EXPR_START",0,0,"               nullptr"
+99,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ,"
+99,PTR_TYPE,CLASS,PARENT_NOT_SET,24,24,25,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                        *"
+99,WORD,NONE,PARENT_NOT_SET,25,25,28,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                         c53"
+99,TSQUARE,NONE,PARENT_NOT_SET,28,28,30,0,0,0,0,"PUNCTUATOR",0,0,"                            []"
+99,ASSIGN,NONE,PARENT_NOT_SET,31,31,32,1,0,0,0,"PUNCTUATOR",0,0,"                               ="
+99,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,33,33,34,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR",0,0,"                                 {"
+99,WORD,NONE,PARENT_NOT_SET,35,35,42,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                   nullptr"
+99,COMMA,NONE,PARENT_NOT_SET,42,42,43,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                          ,"
+99,WORD,NONE,PARENT_NOT_SET,44,44,51,1,1,1,0,"EXPR_START,ONE_LINER",0,0,"                                            nullptr"
+99,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,52,52,53,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                    }"
+99,SEMICOLON,CLASS,PARENT_NOT_SET,53,53,54,0,0,0,0,"PUNCTUATOR",0,0,"                                                     ;"
+99,NEWLINE,NONE,PARENT_NOT_SET,54,54,1,0,0,0,0,"",3,0,
+102,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,44,0,0,0,0,"",0,0," // enum type : integral_type { ... } x, ..."
+102,NEWLINE,NONE,PARENT_NOT_SET,44,44,1,0,0,0,0,"",1,0,
+103,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
+103,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"VAR_TYPE",0,0,"      e1"
+103,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
+103,TYPE,BIT_COLON,PARENT_NOT_SET,11,11,15,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"           long"
+103,TYPE,BIT_COLON,PARENT_NOT_SET,16,16,20,1,0,0,0,"",0,0,"                long"
+103,BRACE_OPEN,ENUM,PARENT_NOT_SET,21,21,22,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                     {"
+103,WORD,NONE,PARENT_NOT_SET,23,23,25,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                       a1"
+103,COMMA,NONE,PARENT_NOT_SET,25,25,26,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                         ,"
+103,WORD,NONE,PARENT_NOT_SET,27,27,29,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                           b1"
+103,COMMA,NONE,PARENT_NOT_SET,29,29,30,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                             ,"
+103,WORD,NONE,PARENT_NOT_SET,31,31,33,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                               d1"
+103,BRACE_CLOSE,ENUM,PARENT_NOT_SET,34,34,35,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                  }"
+103,WORD,NONE,PARENT_NOT_SET,36,36,39,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                    e11"
+103,COMMA,NONE,PARENT_NOT_SET,39,39,40,0,0,0,0,"PUNCTUATOR",0,0,"                                       ,"
+103,WORD,NONE,PARENT_NOT_SET,41,41,44,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                         e12"
+103,COMMA,NONE,PARENT_NOT_SET,44,44,45,0,0,0,0,"PUNCTUATOR",0,0,"                                            ,"
+103,WORD,NONE,PARENT_NOT_SET,46,46,49,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                              e13"
+103,SEMICOLON,ENUM,PARENT_NOT_SET,49,49,50,0,0,0,0,"PUNCTUATOR",0,0,"                                                 ;"
+103,NEWLINE,NONE,PARENT_NOT_SET,50,50,1,0,0,0,0,"",2,0,
+105,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,37,0,0,0,0,"",0,0," // enum type : integral_type { ... }"
+105,NEWLINE,NONE,PARENT_NOT_SET,37,37,1,0,0,0,0,"",1,0,
+106,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
+106,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"",0,0,"      e2"
+106,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
+106,TYPE,BIT_COLON,PARENT_NOT_SET,11,11,19,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"           unsigned"
+106,TYPE,BIT_COLON,PARENT_NOT_SET,20,20,23,1,0,0,0,"",0,0,"                    int"
+106,BRACE_OPEN,ENUM,PARENT_NOT_SET,24,24,25,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                        {"
+106,WORD,NONE,PARENT_NOT_SET,26,26,28,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                          a2"
+106,COMMA,NONE,PARENT_NOT_SET,28,28,29,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                            ,"
+106,WORD,NONE,PARENT_NOT_SET,30,30,32,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                              b2"
+106,COMMA,NONE,PARENT_NOT_SET,32,32,33,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                ,"
+106,WORD,NONE,PARENT_NOT_SET,34,34,36,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                  d2"
+106,BRACE_CLOSE,ENUM,PARENT_NOT_SET,37,37,38,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                     }"
+106,SEMICOLON,ENUM,PARENT_NOT_SET,38,38,39,0,0,0,0,"PUNCTUATOR",0,0,"                                      ;"
+106,NEWLINE,NONE,PARENT_NOT_SET,39,39,1,0,0,0,0,"",2,0,
+108,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,29,0,0,0,0,"",0,0," // enum type : integral_type"
+108,NEWLINE,NONE,PARENT_NOT_SET,29,29,1,0,0,0,0,"",1,0,
+109,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
+109,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"INCOMPLETE",0,0,"      e3"
+109,BIT_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
+109,TYPE,BIT_COLON,PARENT_NOT_SET,11,11,16,1,0,0,0,"STMT_START,EXPR_START",0,0,"           short"
+109,SEMICOLON,ENUM,PARENT_NOT_SET,16,16,17,0,0,0,0,"PUNCTUATOR",0,0,"                ;"
+109,NEWLINE,NONE,PARENT_NOT_SET,17,17,1,0,0,0,0,"",2,0,
+111,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,20,0,0,0,0,"",0,0," // enum type x, ..."
+111,NEWLINE,NONE,PARENT_NOT_SET,20,20,1,0,0,0,0,"",1,0,
+112,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
+112,TYPE,ENUM,PARENT_NOT_SET,6,6,8,1,0,0,0,"FORCE_SPACE,VAR_TYPE",0,0,"      e3"
+112,WORD,NONE,PARENT_NOT_SET,9,9,12,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"         e31"
+112,COMMA,NONE,PARENT_NOT_SET,12,12,13,0,0,0,0,"PUNCTUATOR",0,0,"            ,"
+112,WORD,NONE,PARENT_NOT_SET,14,14,17,1,0,0,0,"EXPR_START,VAR_DEF",0,0,"              e32"
+112,SEMICOLON,ENUM,PARENT_NOT_SET,17,17,18,0,0,0,0,"PUNCTUATOR",0,0,"                 ;"
+112,NEWLINE,NONE,PARENT_NOT_SET,18,18,1,0,0,0,0,"",2,0,
+114,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,50,0,0,0,0,"",0,0," // enum class type : integral_type { ... } x, ..."
+114,NEWLINE,NONE,PARENT_NOT_SET,50,50,1,0,0,0,0,"",1,0,
+115,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
+115,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE",0,0,"      class"
+115,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"VAR_TYPE",0,0,"            e4"
+115,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
+115,TYPE,BIT_COLON,PARENT_NOT_SET,17,17,21,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                 long"
+115,TYPE,BIT_COLON,PARENT_NOT_SET,22,22,26,1,0,0,0,"",0,0,"                      long"
+115,BRACE_OPEN,ENUM,PARENT_NOT_SET,27,27,28,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                           {"
+115,WORD,NONE,PARENT_NOT_SET,29,29,31,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                             a4"
+115,COMMA,NONE,PARENT_NOT_SET,31,31,32,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                               ,"
+115,WORD,NONE,PARENT_NOT_SET,33,33,35,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                 b4"
+115,COMMA,NONE,PARENT_NOT_SET,35,35,36,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                   ,"
+115,WORD,NONE,PARENT_NOT_SET,37,37,39,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                     d4"
+115,BRACE_CLOSE,ENUM,PARENT_NOT_SET,40,40,41,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                        }"
+115,WORD,NONE,PARENT_NOT_SET,42,42,45,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                          e41"
+115,COMMA,NONE,PARENT_NOT_SET,45,45,46,0,0,0,0,"PUNCTUATOR",0,0,"                                             ,"
+115,WORD,NONE,PARENT_NOT_SET,47,47,50,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                               e42"
+115,COMMA,NONE,PARENT_NOT_SET,50,50,51,0,0,0,0,"PUNCTUATOR",0,0,"                                                  ,"
+115,WORD,NONE,PARENT_NOT_SET,52,52,55,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                    e43"
+115,COMMA,NONE,PARENT_NOT_SET,55,55,56,0,0,0,0,"PUNCTUATOR",0,0,"                                                       ,"
+115,WORD,NONE,PARENT_NOT_SET,57,57,60,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                                         e44"
+115,SEMICOLON,ENUM,PARENT_NOT_SET,60,60,61,0,0,0,0,"PUNCTUATOR",0,0,"                                                            ;"
+115,NEWLINE,NONE,PARENT_NOT_SET,61,61,1,0,0,0,0,"",2,0,
+117,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,43,0,0,0,0,"",0,0," // enum class type : integral_type { ... }"
+117,NEWLINE,NONE,PARENT_NOT_SET,43,43,1,0,0,0,0,"",1,0,
+118,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," enum"
+118,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE",0,0,"      class"
+118,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"",0,0,"            e5"
+118,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
+118,TYPE,BIT_COLON,PARENT_NOT_SET,17,17,25,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                 unsigned"
+118,TYPE,BIT_COLON,PARENT_NOT_SET,26,26,29,1,0,0,0,"",0,0,"                          int"
+118,BRACE_OPEN,ENUM,PARENT_NOT_SET,30,30,31,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                              {"
+118,WORD,NONE,PARENT_NOT_SET,32,32,34,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                                a5"
+118,COMMA,NONE,PARENT_NOT_SET,34,34,35,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                  ,"
+118,WORD,NONE,PARENT_NOT_SET,36,36,38,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                    b5"
+118,COMMA,NONE,PARENT_NOT_SET,38,38,39,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                      ,"
+118,WORD,NONE,PARENT_NOT_SET,40,40,42,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                                        d5"
+118,BRACE_CLOSE,ENUM,PARENT_NOT_SET,43,43,44,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                                           }"
+118,SEMICOLON,ENUM,PARENT_NOT_SET,44,44,45,0,0,0,0,"PUNCTUATOR",0,0,"                                            ;"
+118,NEWLINE,NONE,PARENT_NOT_SET,45,45,1,0,0,0,0,"",2,0,
+120,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,35,0,0,0,0,"",0,0," // enum class type : integral_type"
+120,NEWLINE,NONE,PARENT_NOT_SET,35,35,1,0,0,0,0,"",1,0,
+121,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
+121,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"      class"
+121,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"INCOMPLETE",0,0,"            e6"
+121,BIT_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
+121,TYPE,BIT_COLON,PARENT_NOT_SET,17,17,22,1,0,0,0,"STMT_START,EXPR_START",0,0,"                 short"
+121,SEMICOLON,ENUM,PARENT_NOT_SET,22,22,23,0,0,0,0,"PUNCTUATOR",0,0,"                      ;"
+121,NEWLINE,NONE,PARENT_NOT_SET,23,23,1,0,0,0,0,"",2,0,
+123,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,19,0,0,0,0,"",0,0," // enum class type"
+123,NEWLINE,NONE,PARENT_NOT_SET,19,19,1,0,0,0,0,"",1,0,
+124,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START,INCOMPLETE",0,0," enum"
+124,ENUM_CLASS,NONE,PARENT_NOT_SET,6,6,11,1,0,0,0,"FORCE_SPACE,INCOMPLETE",0,0,"      class"
+124,TYPE,ENUM,PARENT_NOT_SET,12,12,14,1,0,0,0,"INCOMPLETE",0,0,"            e7"
+124,SEMICOLON,ENUM,PARENT_NOT_SET,14,14,15,0,0,0,0,"PUNCTUATOR",0,0,"              ;"
+124,NEWLINE,NONE,PARENT_NOT_SET,15,15,1,0,0,0,0,"",2,0,
+126,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,39,0,0,0,0,"",0,0," // enum : integral_type { ... } x, ..."
+126,NEWLINE,NONE,PARENT_NOT_SET,39,39,1,0,0,0,0,"",1,0,
+127,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"STMT_START,EXPR_START",0,0," enum"
+127,BIT_COLON,ENUM,PARENT_NOT_SET,6,6,7,1,0,0,0,"PUNCTUATOR",0,0,"      :"
+127,TYPE,BIT_COLON,PARENT_NOT_SET,8,8,12,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"        long"
+127,TYPE,BIT_COLON,PARENT_NOT_SET,13,13,17,1,0,0,0,"",0,0,"             long"
+127,BRACE_OPEN,ENUM,PARENT_NOT_SET,18,18,19,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                  {"
+127,WORD,NONE,PARENT_NOT_SET,20,20,22,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"                    a8"
+127,COMMA,NONE,PARENT_NOT_SET,22,22,23,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                      ,"
+127,WORD,NONE,PARENT_NOT_SET,24,24,26,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                        b8"
+127,COMMA,NONE,PARENT_NOT_SET,26,26,27,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                          ,"
+127,WORD,NONE,PARENT_NOT_SET,28,28,30,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                            c8"
+127,BRACE_CLOSE,ENUM,PARENT_NOT_SET,31,31,32,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                               }"
+127,WORD,NONE,PARENT_NOT_SET,33,33,36,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                 e81"
+127,COMMA,NONE,PARENT_NOT_SET,36,36,37,0,0,0,0,"PUNCTUATOR",0,0,"                                    ,"
+127,WORD,NONE,PARENT_NOT_SET,38,38,41,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                                      e82"
+127,SEMICOLON,ENUM,PARENT_NOT_SET,41,41,42,0,0,0,0,"PUNCTUATOR",0,0,"                                         ;"
+127,NEWLINE,NONE,PARENT_NOT_SET,42,42,1,0,0,0,0,"",2,0,
+129,COMMENT_CPP,COMMENT_WHOLE,PARENT_NOT_SET,1,1,23,0,0,0,0,"",0,0," // enum { ... } x, ..."
+129,NEWLINE,NONE,PARENT_NOT_SET,23,23,1,0,0,0,0,"",1,0,
+130,ENUM,NONE,PARENT_NOT_SET,1,1,5,0,0,0,0,"STMT_START,EXPR_START",0,0," enum"
+130,BRACE_OPEN,ENUM,PARENT_NOT_SET,6,6,7,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"      {"
+130,WORD,NONE,PARENT_NOT_SET,8,8,10,1,1,1,0,"IN_ENUM,STMT_START,EXPR_START,ONE_LINER",0,0,"        a9"
+130,COMMA,NONE,PARENT_NOT_SET,10,10,11,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"          ,"
+130,WORD,NONE,PARENT_NOT_SET,12,12,14,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"            b9"
+130,COMMA,NONE,PARENT_NOT_SET,14,14,15,0,1,1,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"              ,"
+130,WORD,NONE,PARENT_NOT_SET,16,16,18,1,1,1,0,"IN_ENUM,EXPR_START,ONE_LINER",0,0,"                c9"
+130,BRACE_CLOSE,ENUM,PARENT_NOT_SET,19,19,20,1,0,0,0,"IN_ENUM,ONE_LINER,PUNCTUATOR",0,0,"                   }"
+130,WORD,NONE,PARENT_NOT_SET,21,21,24,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                     e91"
+130,COMMA,NONE,PARENT_NOT_SET,24,24,25,0,0,0,0,"PUNCTUATOR",0,0,"                        ,"
+130,WORD,NONE,PARENT_NOT_SET,26,26,29,1,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE",0,0,"                          e92"
+130,SEMICOLON,ENUM,PARENT_NOT_SET,29,29,30,0,0,0,0,"PUNCTUATOR",0,0,"                             ;"
+130,NEWLINE,NONE,PARENT_NOT_SET,30,30,1,0,0,0,0,"",2,0,
+132,UNION,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," union"
+132,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
+132,TYPE,UNION,PARENT_NOT_SET,18,18,20,1,0,0,0,"VAR_TYPE",0,0,"                  u1"
+132,BRACE_OPEN,UNION,PARENT_NOT_SET,21,21,22,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                     {"
+132,TYPE,NONE,PARENT_NOT_SET,23,23,26,1,1,1,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,ONE_LINER",0,0,"                       int"
+132,WORD,NONE,PARENT_NOT_SET,27,27,28,1,1,1,0,"VAR_DEF,VAR_1ST,ONE_LINER",0,0,"                           x"
+132,SEMICOLON,NONE,PARENT_NOT_SET,28,28,29,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                            ;"
+132,TYPE,NONE,PARENT_NOT_SET,30,30,34,1,1,1,0,"FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE,ONE_LINER",0,0,"                              long"
+132,WORD,NONE,PARENT_NOT_SET,35,35,36,1,1,1,0,"VAR_DEF,VAR_1ST,ONE_LINER",0,0,"                                   y"
+132,SEMICOLON,NONE,PARENT_NOT_SET,36,36,37,0,1,1,0,"ONE_LINER,PUNCTUATOR",0,0,"                                    ;"
+132,BRACE_CLOSE,UNION,PARENT_NOT_SET,38,38,39,1,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                      }"
+132,WORD,NONE,PARENT_NOT_SET,40,40,43,1,0,0,0,"STMT_START,EXPR_START,VAR_DEF,VAR_1ST,VAR_INLINE",0,0,"                                        u11"
+132,COMMA,NONE,PARENT_NOT_SET,43,43,44,0,0,0,0,"PUNCTUATOR",0,0,"                                           ,"
+132,PTR_TYPE,UNION,PARENT_NOT_SET,45,45,46,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                             *"
+132,WORD,NONE,PARENT_NOT_SET,46,46,49,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"                                              u12"
+132,ASSIGN,NONE,PARENT_NOT_SET,50,50,51,1,0,0,0,"PUNCTUATOR",0,0,"                                                  ="
+132,WORD,NONE,PARENT_NOT_SET,52,52,59,1,0,0,0,"EXPR_START",0,0,"                                                    nullptr"
+132,COMMA,NONE,PARENT_NOT_SET,59,59,60,0,0,0,0,"PUNCTUATOR",0,0,"                                                           ,"
+132,PTR_TYPE,UNION,PARENT_NOT_SET,61,61,62,1,0,0,0,"EXPR_START,PUNCTUATOR",0,0,"                                                             *"
+132,WORD,NONE,PARENT_NOT_SET,62,62,65,0,0,0,0,"EXPR_START,VAR_DEF,VAR_INLINE,LVALUE",0,0,"                                                              u13"
+132,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,65,65,66,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                 {"
+132,NUMBER,NONE,PARENT_NOT_SET,66,66,67,0,1,1,0,"STMT_START,EXPR_START,ONE_LINER",0,0,"                                                                  0"
+132,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,67,67,68,0,0,0,0,"ONE_LINER,PUNCTUATOR",0,0,"                                                                   }"
+132,SEMICOLON,UNION,PARENT_NOT_SET,68,68,69,0,0,0,0,"PUNCTUATOR",0,0,"                                                                    ;"
+132,NEWLINE,NONE,PARENT_NOT_SET,69,69,1,0,0,0,0,"",2,0,
+134,UNION,NONE,PARENT_NOT_SET,1,1,6,0,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0," union"
+134,WORD,NONE,PARENT_NOT_SET,7,7,17,1,0,0,0,"FORCE_SPACE",0,0,"       API_EXPORT"
+134,TYPE,UNION,PARENT_NOT_SET,18,18,20,1,0,0,0,"FORCE_SPACE,VAR_TYPE",0,0,"                  u1"
+134,WORD,NONE,PARENT_NOT_SET,21,21,24,1,0,0,0,"VAR_DEF,VAR_1ST",0,0,"                     u21"
+134,SEMICOLON,UNION,PARENT_NOT_SET,24,24,25,0,0,0,0,"PUNCTUATOR",0,0,"                        ;"
+134,NEWLINE,NONE,PARENT_NOT_SET,25,25,1,0,0,0,0,"",1,0,
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.txt
new file mode 100644
index 00000000..4cf1a681
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/class_enum_struct_union.txt
@@ -0,0 +1,692 @@
+
+# option(s) with 'not default' value: 0
+#
+# -=====-
+# number of loops               = 1
+# -=====-
+# language                      = CPP
+# -=====-
+# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp      Flag   Nl  Text
+#   1>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  3][0/0/0][          0][9-0] /**␤    * the enum (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * "enum type [: integral_type] { ... } [x, ...]"␤    * "enum type [: integral_type]"␤    * "enum class type [: integral_type] { ... } [x, ...]"␤    * "enum class type [: integral_type]"␤    * "enum [: integral_type] { ... } x, ..."␤    */
+#  10>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  4/  0][0/0/0][          0][2-0]
+#  12>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  0][0/0/0][          0][9-0] /**␤    * the class/struct (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }␤    * template<...> class/struct[<...>] [macros/attributes ...] type␤    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]␤    * class/struct [macros/attributes ...] type [x, ...]␤    * class/struct [macros/attributes ...] [: bases] { } x, ...␤    */
+#  21>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][          0][2-0]
+#  23>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  2001c0001][0-0] #
+#  23>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/0][      20001][0-0]  define
+#  23>         MACRO_FUNC|               NONE|     PARENT_NOT_SET[  9/  9/ 16/  1][1/1/0][      80001][0-0]         ALIGNAS
+#  23>        FPAREN_OPEN|         MACRO_FUNC|     PARENT_NOT_SET[ 16/ 16/ 17/  0][1/1/0][  200000001][0-0]                (
+#  23>               WORD|               NONE|     PARENT_NOT_SET[ 17/ 17/ 31/  0][1/2/0][      80011][0-0]                 byte_alignment
+#  23>       FPAREN_CLOSE|         MACRO_FUNC|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][  200000011][0-0]                               )
+#  23>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 33/ 33/ 46/  1][1/1/0][          1][0-0]                                 __attribute__
+#  23>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/1/0][  200000001][0-0]                                              (
+#  23>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][1/2/0][  200080001][0-0]                                               (
+#  23>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 55/  0][1/3/0][      80001][0-0]                                                aligned
+#  23>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 55/ 55/ 56/  0][1/3/0][  200000001][0-0]                                                       (
+#  23>               WORD|               NONE|     PARENT_NOT_SET[ 56/ 56/ 70/  0][1/4/0][      80011][0-0]                                                        byte_alignment
+#  23>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 70/ 70/ 71/  0][1/3/0][  200000011][0-0]                                                                      )
+#  23>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 72/  0][1/2/0][  200000001][0-0]                                                                       )
+#  23>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 72/ 72/ 73/  0][1/1/0][  200000001][0-0]                                                                        )
+#  23>            NEWLINE|               NONE|     PARENT_NOT_SET[ 73/ 73/  1/  0][0/0/0][          0][2-0]
+#  25>            PREPROC|              PP_IF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
+#  25>              PP_IF|               NONE|     PARENT_NOT_SET[  2/  2/  4/  0][0/0/1][      20001][0-0]  if
+#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  5/  5/ 12/  1][0/0/1][      80001][0-0]     defined
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/1][  200000001][0-0]             (
+#  25>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 22/  0][0/0/1][      80001][0-0]              __unix__
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/1][  200000001][0-0]                      )
+#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][0/0/1][  200000001][0-0]                        ||
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/1][  200000001][0-0]                           (
+#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 28/ 28/ 35/  0][0/0/1][      80001][0-0]                            defined
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  1][0/0/1][  200000001][0-0]                                    (
+#  25>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 46/  0][0/0/1][      80001][0-0]                                     __APPLE__
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][0/0/1][  200000001][0-0]                                              )
+#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  1][0/0/1][  200000001][0-0]                                                &&
+#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 51/ 51/ 58/  1][0/0/1][          1][0-0]                                                   defined
+#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  1][0/0/1][  200000001][0-0]                                                           (
+#  25>               WORD|               NONE|     PARENT_NOT_SET[ 60/ 60/ 68/  0][0/0/1][      80001][0-0]                                                            __MACH__
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/1][  200000001][0-0]                                                                    )
+#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 69/ 69/ 70/  0][0/0/1][  200000001][0-0]                                                                     )
+#  25>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/1][          0][1-0]
+#  26>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
+#  26>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
+#  26>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][      20001][0-0]         API_EXPORT
+#  26>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 20/ 20/ 33/  1][1/1/1][      80001][0-0]                    __attribute__
+#  26>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 34/ 34/ 35/  1][1/1/1][  2000c0001][0-0]                                  (
+#  26>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/2/1][  200080001][0-0]                                   (
+#  26>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 36/ 36/ 46/  0][1/3/1][      80001][0-0]                                    visibility
+#  26>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/3/1][  200000001][0-0]                                              (
+#  26>             STRING|         PP_INCLUDE|     PARENT_NOT_SET[ 47/ 47/ 56/  0][1/4/1][      80011][0-0]                                               "default"
+#  26>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 56/ 56/ 57/  0][1/3/1][  200000011][0-0]                                                        )
+#  26>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 57/ 57/ 58/  0][1/2/1][  200000001][0-0]                                                         )
+#  26>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][1/1/1][  200000001][0-0]                                                          )
+#  26>            NEWLINE|               NONE|     PARENT_NOT_SET[ 59/ 59/  1/  0][0/0/1][          0][1-0]
+#  27>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
+#  27>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][      20001][0-0]  elif
+#  27>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/1][      a0001][0-0]       defined
+#  27>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 21/  1][0/0/1][          1][0-0]               _WIN32
+#  27>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/1][          0][1-0]
+#  28>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
+#  28>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
+#  28>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][      20001][0-0]         API_EXPORT
+#  28>           DECLSPEC|               NONE|     PARENT_NOT_SET[ 20/ 20/ 30/  1][1/1/1][      c0001][0-0]                    __declspec
+#  28>         PAREN_OPEN|           DECLSPEC|     PARENT_NOT_SET[ 30/ 30/ 31/  0][1/1/1][  200000001][0-0]                              (
+#  28>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 40/  0][1/2/1][      80001][0-0]                               dllexport
+#  28>        PAREN_CLOSE|           DECLSPEC|     PARENT_NOT_SET[ 40/ 40/ 41/  0][1/1/1][  200000001][0-0]                                        )
+#  28>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 41/  1/  0][0/0/1][          0][1-0]
+#  29>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
+#  29>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][          1][0-0]  else
+#  29>            NEWLINE|               NONE|     PARENT_NOT_SET[  6/  6/  1/  0][0/0/1][          0][1-0]
+#  30>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
+#  30>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
+#  30>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][          1][0-0]         API_EXPORT
+#  30>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/1][          0][1-0]
+#  31>            PREPROC|           PP_ENDIF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
+#  31>           PP_ENDIF|               NONE|              PP_IF[  2/  2/  7/  0][0/0/0][          1][0-0]  endif
+#  31>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][          0][2-0]
+#  33>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][0/0/0][      e0000][0-0] namespace
+#  33>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][0/0/0][          0][0-0]           outer_namespace
+#  33>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][0/0/0][          0][1-0]
+#  34>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] {
+#  34>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][       1000][2-0]
+#  36>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][1/1/0][      e1000][0-0] namespace
+#  36>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][1/1/0][       1000][0-0]           inner_namespace
+#  36>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][1/1/0][       1000][1-0]
+#  37>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  200001000][0-0] {
+#  37>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][2/2/0][       1000][2-0]
+#  39>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][2/2/0][      e1000][0-0] class
+#  39>               TYPE|              CLASS|     PARENT_NOT_SET[  7/  7/ 12/  1][2/2/0][       1000][0-0]       Base1
+#  39>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 13/ 13/ 14/  1][2/2/0][  2c0001400][0-0]             {
+#  39>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 15/ 15/ 16/  1][2/2/0][  2c0001400][0-0]               }
+#  39>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 16/ 16/ 17/  0][2/2/0][  200000000][0-0]                ;
+#  39>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][2/2/0][          0][2-0]
+#  41>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][2/2/0][      c0000][0-0] template
+#  41>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][2/2/0][  200000040][0-0]         <
+#  41>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][2/3/0][      80040][0-0]          typename
+#  41>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][2/2/0][  200000040][0-0]                  >
+#  41>              CLASS|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 25/  1][2/2/0][      a0000][0-0]                    class
+#  41>               TYPE|              CLASS|     PARENT_NOT_SET[ 26/ 26/ 31/  1][2/2/0][          0][0-0]                          Base2
+#  41>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 32/ 32/ 33/  1][2/2/0][  2c0000400][0-0]                                {
+#  41>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 34/ 34/ 35/  1][2/2/0][  2c0000400][0-0]                                  }
+#  41>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 35/ 35/ 36/  0][2/2/0][  200000000][0-0]                                   ;
+#  41>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 36/  1/  0][2/2/0][          0][2-0]
+#  43>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  200000000][0-0] }
+#  43>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][          0][2-0]
+#  45>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] }
+#  45>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][0/0/0][          0][2-0]
+#  47>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 82/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }
+#  47>            NEWLINE|               NONE|     PARENT_NOT_SET[ 82/ 82/  1/  0][0/0/0][          0][1-0]
+#  48>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
+#  48>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
+#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
+#  48>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
+#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
+#  48>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
+#  48>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
+#  48>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
+#  49>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      a0000][0-0] class
+#  49>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
+#  49>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][          0][0-0]                  __attribute__
+#  49>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][  200000000][0-0]                               (
+#  49>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][  200080000][0-0]                                (
+#  49>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][      80000][0-0]                                 __deprecated__
+#  49>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][  200000000][0-0]                                               )
+#  49>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][  200000000][0-0]                                                )
+#  49>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
+#  49>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
+#  49>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
+#  49>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
+#  49>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][          0][0-0]                                                             c1
+#  49>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][          0][1-0]
+#  50>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
+#  50>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
+#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
+#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
+#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
+#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
+#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base1
+#  50>              COMMA|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][  200000800][0-0]                                                         ,
+#  50>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  3/  0][0/0/0][          0][1-0]
+#  51>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][      a0800][0-0]         public
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 25/  1][0/0/0][        800][0-0]                outer_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 31/ 25/ 27/  0][0/0/0][  200000800][0-0]                               ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 33/ 27/ 42/  0][0/0/0][        800][0-0]                                 inner_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 50/ 44/ 49/  0][0/0/0][        800][0-0]                                                  Base2
+#  51>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 55/ 49/ 50/  0][0/0/0][  200000840][0-0]                                                       <
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 56/ 50/ 65/  0][0/1/0][      80840][0-0]                                                        outer_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 71/ 65/ 67/  0][0/1/0][  200000840][0-0]                                                                       ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 73/ 67/ 82/  0][0/1/0][        840][0-0]                                                                         inner_namespace
+#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 88/ 82/ 84/  0][0/1/0][  200000840][0-0]                                                                                        ::
+#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 90/ 84/ 89/  0][0/1/0][        840][0-0]                                                                                          Base1
+#  51>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 95/ 89/ 90/  0][0/0/0][  200000840][0-0]                                                                                               >
+#  51>            NEWLINE|               NONE|     PARENT_NOT_SET[ 96/ 90/  1/  0][0/0/0][          0][1-0]
+#  52>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  280080400][0-0] {
+#  52>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][2-0]
+#  54>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  280000400][0-0] }
+#  54>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][  200000000][0-0]  ;
+#  54>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][          0][2-0]
+#  56>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 70/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type { }
+#  56>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/0][          0][1-0]
+#  57>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
+#  57>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
+#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
+#  57>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
+#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
+#  57>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
+#  57>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
+#  57>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
+#  58>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      a0000][0-0] class
+#  58>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
+#  58>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][          0][0-0]                  c2
+#  58>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][          0][1-0]
+#  59>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] {
+#  59>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
+#  60>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
+#  60>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
+#  60>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][2-0]
+#  62>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  4/ 12/  0][1/1/0][      c0400][0-0] template
+#  62>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/ 12/ 13/  0][1/1/0][  200000440][0-0]         <
+#  62>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 13/ 21/  0][1/2/0][      a0440][0-0]          typename
+#  62>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][        440][0-0]                   T
+#  62>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 20/ 23/ 24/  0][1/1/0][  200000440][0-0]                    >
+#  62>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 24/  4/  0][1/1/0][        400][1-0]
+#  63>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[  1/  4/ 10/  0][1/1/0][      a0400][0-0] struct
+#  63>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/ 11/ 22/  1][1/1/0][        400][0-0]        inner_class
+#  63>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 22/  4/  0][1/1/0][        400][1-0]
+#  64>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][  200000400][0-0] {
+#  64>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  5/  7/  0][2/2/0][        402][1-0]
+#  65>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  7/ 13/  0][2/2/0][     8e0402][0-0]         static
+#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 14/ 25/  1][2/2/0][     800402][0-0]                inner_class
+#  65>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 27/ 25/ 26/  0][2/2/0][  200000442][0-0]                           <
+#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 28/ 26/ 27/  0][2/3/0][      80442][0-0]                            T
+#  65>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 29/ 27/ 28/  0][2/2/0][  200000442][0-0]                             >
+#  65>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 31/ 29/ 30/  1][2/2/0][  200880402][0-0]                               *
+#  65>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 30/ 43/  0][2/2/0][    3080402][0-0]                                m_inner_class
+#  65>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 45/ 43/ 44/  0][2/2/0][  200000402][0-0]                                             ;
+#  65>            NEWLINE|               NONE|     PARENT_NOT_SET[ 46/ 44/  4/  0][2/2/0][        402][1-0]
+#  66>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][  200000402][0-0] }
+#  66>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  5/  6/  0][1/1/0][  200000400][0-0]  ;
+#  66>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  6/  1/  0][1/1/0][        400][1-0]
+#  67>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
+#  67>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][  200000000][0-0]  ;
+#  67>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][          0][2-0]
+#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][0/0/0][  200080040][0-0]          >
+#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[ 12/ 12/ 20/  1][0/0/0][      80000][0-0]            template
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000040][0-0]                    <
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/0/0][  200080040][0-0]                     >
+#  69>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[ 23/ 23/ 29/  1][0/0/0][      a0000][0-0]                       struct
+#  69>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 40/  1][0/0/0][      20000][0-0]                              API_EXPORT
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 41/ 41/ 43/  1][0/0/0][          0][0-0]                                         c2
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][  200000040][0-0]                                           <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 44/ 44/ 47/  0][0/1/0][      80040][0-0]                                            int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/0/0][  200000040][0-0]                                               >
+#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  0][0/0/0][  200080000][0-0]                                                ::
+#  69>               TYPE|             STRUCT|     PARENT_NOT_SET[ 50/ 50/ 61/  0][0/0/0][     800000][0-0]                                                  inner_class
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][0/0/0][  200000040][0-0]                                                             <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/1/0][      80040][0-0]                                                              int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][  200000040][0-0]                                                                 >
+#  69>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  1][0/0/0][  200080000][0-0]                                                                   *
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 70/  0][0/0/0][      80000][0-0]                                                                    c2
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 70/ 70/ 71/  0][0/0/0][  200000040][0-0]                                                                      <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 74/  0][0/1/0][      80040][0-0]                                                                       int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 74/ 74/ 75/  0][0/0/0][  200000040][0-0]                                                                          >
+#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 75/ 75/ 77/  0][0/0/0][  200080000][0-0]                                                                           ::
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 77/ 77/ 88/  0][0/0/0][          0][0-0]                                                                             inner_class
+#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 88/ 88/ 89/  0][0/0/0][  200000040][0-0]                                                                                        <
+#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 89/ 89/ 92/  0][0/1/0][      80040][0-0]                                                                                         int
+#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 92/ 92/ 93/  0][0/0/0][  200000040][0-0]                                                                                            >
+#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 93/ 93/ 95/  0][0/0/0][  200080000][0-0]                                                                                             ::
+#  69>               WORD|               NONE|     PARENT_NOT_SET[ 95/ 95/108/  0][0/0/0][   23000000][0-0]                                                                                               m_inner_class
+#  69>             ASSIGN|               NONE|     PARENT_NOT_SET[109/109/110/  1][0/0/0][  200000000][0-0]                                                                                                             =
+#  69>               WORD|               NONE|     PARENT_NOT_SET[111/111/118/  1][0/0/0][      80000][0-0]                                                                                                               nullptr
+#  69>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[118/118/119/  0][0/0/0][  200000000][0-0]                                                                                                                      ;
+#  69>            NEWLINE|               NONE|     PARENT_NOT_SET[119/119/  1/  0][0/0/0][          0][2-0]
+#  71>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 66/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type
+#  71>            NEWLINE|               NONE|     PARENT_NOT_SET[ 66/ 66/  1/  0][0/0/0][          0][1-0]
+#  72>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
+#  72>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
+#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
+#  72>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
+#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
+#  72>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
+#  72>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
+#  72>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
+#  73>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][1000000a0000][0-0] class
+#  73>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][100000020000][0-0]       API_EXPORT
+#  73>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][100000000000][0-0]                  c2
+#  73>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000000][0-0]                    ;
+#  73>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/0][          0][2-0]
+#  75>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
+#  75>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][          0][1-0]
+#  76>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
+#  76>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
+#  76>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][          0][0-0]                  __attribute__
+#  76>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][  200000000][0-0]                               (
+#  76>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][  200080000][0-0]                                (
+#  76>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][      80000][0-0]                                 __deprecated__
+#  76>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][  200000000][0-0]                                               )
+#  76>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][  200000000][0-0]                                                )
+#  76>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
+#  76>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
+#  76>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
+#  76>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
+#  76>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][     800000][0-0]                                                             c3
+#  76>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][          0][1-0]
+#  77>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
+#  77>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
+#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
+#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base2
+#  77>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][  200000840][0-0]                                                         <
+#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 58/ 50/ 53/  0][0/1/0][      80840][0-0]                                                          int
+#  77>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 61/ 53/ 54/  0][0/0/0][  200000840][0-0]                                                             >
+#  77>              COMMA|               NONE|     PARENT_NOT_SET[ 62/ 54/ 55/  0][0/0/0][  200080800][0-0]                                                              ,
+#  77>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 55/  3/  0][0/0/0][          0][1-0]
+#  78>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][      a0800][0-0]         public
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 12/  1][0/0/0][        800][0-0]                c2
+#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 18/ 12/ 13/  0][0/0/0][  200000840][0-0]                  <
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 13/ 16/  0][0/1/0][      80840][0-0]                   int
+#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 22/ 16/ 17/  0][0/0/0][  200000840][0-0]                      >
+#  78>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 23/ 17/ 19/  0][0/0/0][  200080800][0-0]                       ::
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 25/ 19/ 30/  0][0/0/0][        800][0-0]                         inner_class
+#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 36/ 30/ 31/  0][0/0/0][  200000840][0-0]                                    <
+#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 37/ 31/ 34/  0][0/1/0][      80840][0-0]                                     int
+#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 40/ 34/ 35/  0][0/0/0][  200000840][0-0]                                        >
+#  78>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 35/  1/  0][0/0/0][          0][1-0]
+#  79>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200080400][0-0] {
+#  79>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
+#  80>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
+#  80>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
+#  80>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][1-0]
+#  81>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  1/  4/  6/  0][1/1/0][      c0400][0-0] c3
+#  81>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  3/  6/  7/  0][1/1/0][  200000500][0-0]   (
+#  81>               TYPE|               NONE|     PARENT_NOT_SET[  4/  7/ 10/  0][1/2/0][   208a0510][0-0]    int
+#  81>               WORD|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  1][1/2/0][   21000510][0-0]        x
+#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 10/ 13/ 14/  1][1/2/0][  200000510][0-0]          =
+#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 12/ 15/ 16/  1][1/2/0][      80510][0-0]            0
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 13/ 16/ 17/  0][1/2/0][  200000510][0-0]             ,
+#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 15/ 18/ 21/  1][1/2/0][   208a0510][0-0]               int
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][   21000510][0-0]                   y
+#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 21/ 24/ 25/  1][1/2/0][  200000510][0-0]                     =
+#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 23/ 26/ 27/  1][1/2/0][      80510][0-0]                       0
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 27/ 28/  0][1/2/0][  200000510][0-0]                        ,
+#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 26/ 29/ 32/  1][1/2/0][   208a0510][0-0]                          int
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 33/ 34/  1][1/2/0][   21000510][0-0]                              z
+#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 32/ 35/ 36/  1][1/2/0][  200000510][0-0]                                =
+#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 34/ 37/ 38/  1][1/2/0][      80510][0-0]                                  0
+#  81>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 35/ 38/ 39/  0][1/1/0][  200000510][0-0]                                   )
+#  81>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 37/ 40/ 41/  1][1/1/0][  200000500][0-0]                                     :
+#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 39/ 42/ 45/  1][1/1/0][      c0500][0-0]                                       m_x
+#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 42/ 45/ 46/  0][1/1/0][  200000500][0-0]                                          (
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 43/ 46/ 47/  0][1/2/0][      80510][0-0]                                           x
+#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 44/ 47/ 48/  0][1/1/0][  200000510][0-0]                                            )
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 48/ 49/  0][1/1/0][  200000500][0-0]                                             ,
+#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 47/ 50/ 53/  1][1/1/0][      80500][0-0]                                               m_y
+#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 50/ 53/ 54/  0][1/1/0][  200000500][0-0]                                                  (
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 51/ 54/ 55/  0][1/2/0][      80510][0-0]                                                   y
+#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 52/ 55/ 56/  0][1/1/0][  200000510][0-0]                                                    )
+#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 56/ 57/  0][1/1/0][  200000500][0-0]                                                     ,
+#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 55/ 58/ 61/  1][1/1/0][      80500][0-0]                                                       m_z
+#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 58/ 61/ 62/  0][1/1/0][  200000500][0-0]                                                          (
+#  81>               WORD|               NONE|     PARENT_NOT_SET[ 59/ 62/ 63/  0][1/2/0][      80510][0-0]                                                           z
+#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 60/ 63/ 64/  0][1/1/0][  200000510][0-0]                                                            )
+#  81>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 62/ 65/ 66/  1][1/1/0][  280000400][0-0]                                                              {
+#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 67/  0/  0][1/1/0][        400][1-0]
+#  81>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  1/ 67/ 68/  1][1/1/0][  280000400][0-0] }
+#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/ 68/  4/  0][1/1/0][        400][2-0]
+#  83>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
+#  83>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_x
+#  83>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
+#  83>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
+#  84>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
+#  84>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_y
+#  84>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
+#  84>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
+#  85>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
+#  85>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_z
+#  85>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
+#  85>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][        400][1-0]
+#  86>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
+#  86>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][    70c0000][0-0]   c31
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][  200000000][0-0]      ,
+#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][  200080000][0-0]        *
+#  86>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][   25080000][0-0]         c32
+#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][  200000000][0-0]             =
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][      80000][0-0]               nullptr
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ,
+#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  200080000][0-0]                        *
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][    5080000][0-0]                         c33
+#  86>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][  200000000][0-0]                            []
+#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  200000000][0-0]                               =
+#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][  240080000][0-0]                                 {
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][   40080000][0-0]                                   nullptr
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][  240000000][0-0]                                          ,
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][   40080000][0-0]                                            nullptr
+#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][  240000000][0-0]                                                    }
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][  200000000][0-0]                                                     ,
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 55/ 55/ 58/  1][0/0/0][   25080000][0-0]                                                       c34
+#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/0/0][  240000000][0-0]                                                          {
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 60/ 60/ 61/  1][1/1/0][   400c0000][0-0]                                                            0
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][1/1/0][  240000000][0-0]                                                             ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 63/ 63/ 64/  1][1/1/0][   40080000][0-0]                                                               1
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 64/ 64/ 65/  0][1/1/0][  240000000][0-0]                                                                ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  1][1/1/0][   40080000][0-0]                                                                  2
+#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  240000000][0-0]                                                                   }
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][  200000000][0-0]                                                                    ,
+#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 70/ 70/ 71/  1][0/0/0][  200080000][0-0]                                                                      *
+#  86>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 72/ 72/ 77/  1][0/0/0][      a0000][0-0]                                                                        const
+#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 78/ 78/ 81/  1][0/0/0][    5000000][0-0]                                                                              c35
+#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 81/ 81/ 82/  0][0/0/0][  200000000][0-0]                                                                                 (
+#  86>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 89/  0][0/1/0][      80010][0-0]                                                                                  nullptr
+#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 89/ 89/ 90/  0][0/0/0][  200000010][0-0]                                                                                         )
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 90/ 90/ 91/  0][0/0/0][  200000000][0-0]                                                                                          ,
+#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 92/ 92/ 95/  1][0/0/0][    5080000][0-0]                                                                                            c16
+#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][  200000000][0-0]                                                                                               (
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 96/ 96/ 97/  0][0/1/0][      80010][0-0]                                                                                                0
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 97/ 97/ 98/  0][0/1/0][  200000010][0-0]                                                                                                 ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 99/ 99/100/  1][0/1/0][      80010][0-0]                                                                                                   1
+#  86>              COMMA|               NONE|     PARENT_NOT_SET[100/100/101/  0][0/1/0][  200000010][0-0]                                                                                                    ,
+#  86>             NUMBER|               NONE|     PARENT_NOT_SET[102/102/103/  1][0/1/0][      80010][0-0]                                                                                                      2
+#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[103/103/104/  0][0/0/0][  200000010][0-0]                                                                                                       )
+#  86>          SEMICOLON|              CLASS|     PARENT_NOT_SET[104/104/105/  0][0/0/0][  200000000][0-0]                                                                                                        ;
+#  86>            NEWLINE|               NONE|     PARENT_NOT_SET[105/105/  1/  0][0/0/0][          0][2-0]
+#  88>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 52/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type x, ...
+#  88>            NEWLINE|               NONE|     PARENT_NOT_SET[ 52/ 52/  1/  0][0/0/0][          0][1-0]
+#  89>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
+#  89>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[  7/  7/ 20/  1][0/0/0][          0][0-0]       __attribute__
+#  89>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000000][0-0]                    (
+#  89>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/1/0][  200080000][0-0]                     (
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 22/ 22/ 36/  0][0/2/0][      80000][0-0]                      __deprecated__
+#  89>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/1/0][  200000000][0-0]                                    )
+#  89>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 37/ 37/ 38/  0][0/0/0][  200000000][0-0]                                     )
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 39/ 39/ 49/  1][0/0/0][      e0000][0-0]                                       API_EXPORT
+#  89>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
+#  89>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
+#  89>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
+#  89>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][     820000][0-0]                                                             c3
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 64/ 64/ 67/  1][0/0/0][    3000000][0-0]                                                                c41
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  200000000][0-0]                                                                   ,
+#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 69/ 69/ 70/  1][0/0/0][  200080000][0-0]                                                                     *
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 70/ 70/ 73/  0][0/0/0][   21080000][0-0]                                                                      c42
+#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[ 74/ 74/ 75/  1][0/0/0][  200000000][0-0]                                                                          =
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 76/ 76/ 79/  1][0/0/0][      80000][0-0]                                                                            c32
+#  89>           QUESTION|               NONE|     PARENT_NOT_SET[ 80/ 80/ 81/  1][0/0/0][  200000000][0-0]                                                                                ?
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 85/  1][0/0/0][      80000][0-0]                                                                                  c32
+#  89>         COND_COLON|               NONE|     PARENT_NOT_SET[ 86/ 86/ 87/  1][0/0/0][  200000000][0-0]                                                                                      :
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 88/ 88/ 95/  1][0/0/0][      c0000][0-0]                                                                                        nullptr
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][  200000000][0-0]                                                                                               ,
+#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 97/ 97/ 98/  1][0/0/0][  200080000][0-0]                                                                                                 *
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 98/ 98/101/  0][0/0/0][    1080000][0-0]                                                                                                  c43
+#  89>            TSQUARE|               NONE|     PARENT_NOT_SET[101/101/103/  0][0/0/0][  200000000][0-0]                                                                                                     []
+#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[104/104/105/  1][0/0/0][  200000000][0-0]                                                                                                        =
+#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[106/106/107/  1][0/0/0][  240080000][0-0]                                                                                                          {
+#  89>               WORD|               NONE|     PARENT_NOT_SET[108/108/115/  1][1/1/0][   40080000][0-0]                                                                                                            nullptr
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[115/115/116/  0][1/1/0][  240000000][0-0]                                                                                                                   ,
+#  89>               WORD|               NONE|     PARENT_NOT_SET[117/117/124/  1][1/1/0][   40080000][0-0]                                                                                                                     nullptr
+#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[125/125/126/  1][0/0/0][  240000000][0-0]                                                                                                                             }
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[126/126/127/  0][0/0/0][  200000000][0-0]                                                                                                                              ,
+#  89>               WORD|               NONE|     PARENT_NOT_SET[128/128/131/  1][0/0/0][   21080000][0-0]                                                                                                                                c44
+#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[131/131/132/  0][0/0/0][  240000000][0-0]                                                                                                                                   {
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[133/133/134/  1][1/1/0][   400c0000][0-0]                                                                                                                                     0
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[134/134/135/  0][1/1/0][  240000000][0-0]                                                                                                                                      ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[136/136/137/  1][1/1/0][   40080000][0-0]                                                                                                                                        1
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[137/137/138/  0][1/1/0][  240000000][0-0]                                                                                                                                         ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[139/139/140/  1][1/1/0][   40080000][0-0]                                                                                                                                           2
+#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[140/140/141/  0][0/0/0][  240000000][0-0]                                                                                                                                            }
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[141/141/142/  0][0/0/0][  200000000][0-0]                                                                                                                                             ,
+#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[143/143/144/  1][0/0/0][  200080000][0-0]                                                                                                                                               *
+#  89>          QUALIFIER|               NONE|     PARENT_NOT_SET[145/145/150/  1][0/0/0][      a0000][0-0]                                                                                                                                                 const
+#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[151/151/154/  1][0/0/0][    1000000][0-0]                                                                                                                                                       c45
+#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[154/154/155/  0][0/0/0][  200000000][0-0]                                                                                                                                                          (
+#  89>               WORD|               NONE|     PARENT_NOT_SET[155/155/162/  0][0/1/0][      80010][0-0]                                                                                                                                                           nullptr
+#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[162/162/163/  0][0/0/0][  200000010][0-0]                                                                                                                                                                  )
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[163/163/164/  0][0/0/0][  200000000][0-0]                                                                                                                                                                   ,
+#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[165/165/168/  1][0/0/0][    1080000][0-0]                                                                                                                                                                     c46
+#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[168/168/169/  0][0/0/0][  200000000][0-0]                                                                                                                                                                        (
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[169/169/170/  0][0/1/0][      80010][0-0]                                                                                                                                                                         0
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[170/170/171/  0][0/1/0][  200000010][0-0]                                                                                                                                                                          ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[172/172/173/  1][0/1/0][      80010][0-0]                                                                                                                                                                            1
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[173/173/174/  0][0/1/0][  200000010][0-0]                                                                                                                                                                             ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[175/175/176/  1][0/1/0][      80010][0-0]                                                                                                                                                                               2
+#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[176/176/177/  0][0/0/0][  200000010][0-0]                                                                                                                                                                                )
+#  89>          SEMICOLON|              CLASS|     PARENT_NOT_SET[177/177/178/  0][0/0/0][  200000000][0-0]                                                                                                                                                                                 ;
+#  89>            NEWLINE|               NONE|     PARENT_NOT_SET[178/178/  1/  0][0/0/0][          0][2-0]
+#  91>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
+#  91>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][          0][1-0]
+#  92>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
+#  92>          FUNC_CALL|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/0][          0][0-0]       ALIGNAS
+#  92>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][  200000000][0-0]              (
+#  92>             NUMBER|               NONE|     PARENT_NOT_SET[ 15/ 15/ 16/  0][0/1/0][      80010][0-0]               4
+#  92>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][  200000010][0-0]                )
+#  92>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 18/ 28/  1][0/0/0][      20000][0-0]                  API_EXPORT
+#  92>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 29/ 29/ 42/  1][0/0/0][          0][0-0]                             __attribute__
+#  92>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][0/0/0][  200000000][0-0]                                          (
+#  92>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/1/0][  200080000][0-0]                                           (
+#  92>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 58/  0][0/2/0][      80000][0-0]                                            __deprecated__
+#  92>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][  200000000][0-0]                                                          )
+#  92>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
+#  92>            NEWLINE|               NONE|     PARENT_NOT_SET[ 60/ 60/  1/  0][0/0/0][          0][1-0]
+#  93>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
+#  93>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
+#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
+#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
+#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
+#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
+#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base1
+#  93>            NEWLINE|               NONE|     PARENT_NOT_SET[ 57/ 49/  1/  0][0/0/0][          0][1-0]
+#  94>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] {
+#  94>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
+#  95>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
+#  95>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
+#  95>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][1-0]
+#  96>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
+#  96>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_x
+#  96>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
+#  96>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
+#  97>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
+#  97>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_y
+#  97>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
+#  97>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
+#  98>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
+#  98>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_z
+#  98>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
+#  98>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][        400][1-0]
+#  99>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
+#  99>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][    70c0000][0-0]   c51
+#  99>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][  200000000][0-0]      ,
+#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][  200080000][0-0]        *
+#  99>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][   25080000][0-0]         c52
+#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][  200000000][0-0]             =
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][      80000][0-0]               nullptr
+#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ,
+#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  200080000][0-0]                        *
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][    5080000][0-0]                         c53
+#  99>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][  200000000][0-0]                            []
+#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  200000000][0-0]                               =
+#  99>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][  240080000][0-0]                                 {
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][   40080000][0-0]                                   nullptr
+#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][  240000000][0-0]                                          ,
+#  99>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][   40080000][0-0]                                            nullptr
+#  99>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][  240000000][0-0]                                                    }
+#  99>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][  200000000][0-0]                                                     ;
+#  99>            NEWLINE|               NONE|     PARENT_NOT_SET[ 54/ 54/  1/  0][0/0/0][          0][3-0]
+# 102>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 44/  0][0/0/0][          0][0-0] // enum type : integral_type { ... } x, ...
+# 102>            NEWLINE|               NONE|     PARENT_NOT_SET[ 44/ 44/  1/  0][0/0/0][          0][1-0]
+# 103>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
+# 103>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][     800000][0-0]      e1
+# 103>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
+# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 15/  1][0/0/0][      e0000][0-0]           long
+# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 16/ 16/ 20/  1][0/0/0][          0][0-0]                long
+# 103>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][  240000000][0-0]                     {
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 23/ 23/ 25/  1][1/1/0][   400c0004][0-0]                       a1
+# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 25/ 25/ 26/  0][1/1/0][  240000004][0-0]                         ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 29/  1][1/1/0][   40080004][0-0]                           b1
+# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 29/ 30/  0][1/1/0][  240000004][0-0]                             ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 33/  1][1/1/0][   40080004][0-0]                               d1
+# 103>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 34/ 34/ 35/  1][0/0/0][  240000004][0-0]                                  }
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 39/  1][0/0/0][    70c0000][0-0]                                    e11
+# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 39/ 39/ 40/  0][0/0/0][  200000000][0-0]                                       ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 41/ 41/ 44/  1][0/0/0][    5080000][0-0]                                         e12
+# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][  200000000][0-0]                                            ,
+# 103>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  1][0/0/0][    5080000][0-0]                                              e13
+# 103>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 49/ 49/ 50/  0][0/0/0][  200000000][0-0]                                                 ;
+# 103>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][          0][2-0]
+# 105>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 37/  0][0/0/0][          0][0-0] // enum type : integral_type { ... }
+# 105>            NEWLINE|               NONE|     PARENT_NOT_SET[ 37/ 37/  1/  0][0/0/0][          0][1-0]
+# 106>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
+# 106>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][          0][0-0]      e2
+# 106>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
+# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 19/  1][0/0/0][      e0000][0-0]           unsigned
+# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 20/ 20/ 23/  1][0/0/0][          0][0-0]                    int
+# 106>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  240000000][0-0]                        {
+# 106>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 28/  1][1/1/0][   400c0004][0-0]                          a2
+# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][  240000004][0-0]                            ,
+# 106>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 32/  1][1/1/0][   40080004][0-0]                              b2
+# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][1/1/0][  240000004][0-0]                                ,
+# 106>               WORD|               NONE|     PARENT_NOT_SET[ 34/ 34/ 36/  1][1/1/0][   40080004][0-0]                                  d2
+# 106>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 37/ 37/ 38/  1][0/0/0][  240000004][0-0]                                     }
+# 106>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 38/ 38/ 39/  0][0/0/0][  200000000][0-0]                                      ;
+# 106>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][          0][2-0]
+# 108>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 29/  0][0/0/0][          0][0-0] // enum type : integral_type
+# 108>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 29/  1/  0][0/0/0][          0][1-0]
+# 109>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
+# 109>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][100000000000][0-0]      e3
+# 109>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
+# 109>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 16/  1][0/0/0][      c0000][0-0]           short
+# 109>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][  200000000][0-0]                ;
+# 109>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][0/0/0][          0][2-0]
+# 111>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 20/  0][0/0/0][          0][0-0] // enum type x, ...
+# 111>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][          0][1-0]
+# 112>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
+# 112>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][     820000][0-0]      e3
+# 112>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  1][0/0/0][    3000000][0-0]         e31
+# 112>              COMMA|               NONE|     PARENT_NOT_SET[ 12/ 12/ 13/  0][0/0/0][  200000000][0-0]            ,
+# 112>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 17/  1][0/0/0][    1080000][0-0]              e32
+# 112>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 17/ 17/ 18/  0][0/0/0][  200000000][0-0]                 ;
+# 112>            NEWLINE|               NONE|     PARENT_NOT_SET[ 18/ 18/  1/  0][0/0/0][          0][2-0]
+# 114>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 50/  0][0/0/0][          0][0-0] // enum class type : integral_type { ... } x, ...
+# 114>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][          0][1-0]
+# 115>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
+# 115>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][      20000][0-0]      class
+# 115>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][     800000][0-0]            e4
+# 115>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
+# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 21/  1][0/0/0][      e0000][0-0]                 long
+# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 22/ 22/ 26/  1][0/0/0][          0][0-0]                      long
+# 115>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/0][  240000000][0-0]                           {
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 29/ 29/ 31/  1][1/1/0][   400c0004][0-0]                             a4
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][  240000004][0-0]                               ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 35/  1][1/1/0][   40080004][0-0]                                 b4
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/1/0][  240000004][0-0]                                   ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 39/  1][1/1/0][   40080004][0-0]                                     d4
+# 115>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 40/ 40/ 41/  1][0/0/0][  240000004][0-0]                                        }
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 42/ 42/ 45/  1][0/0/0][    70c0000][0-0]                                          e41
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 45/ 46/  0][0/0/0][  200000000][0-0]                                             ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 47/ 47/ 50/  1][0/0/0][    5080000][0-0]                                               e42
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  0][0/0/0][  200000000][0-0]                                                  ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 55/  1][0/0/0][    5080000][0-0]                                                    e43
+# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 55/ 55/ 56/  0][0/0/0][  200000000][0-0]                                                       ,
+# 115>               WORD|               NONE|     PARENT_NOT_SET[ 57/ 57/ 60/  1][0/0/0][    5080000][0-0]                                                         e44
+# 115>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 60/ 60/ 61/  0][0/0/0][  200000000][0-0]                                                            ;
+# 115>            NEWLINE|               NONE|     PARENT_NOT_SET[ 61/ 61/  1/  0][0/0/0][          0][2-0]
+# 117>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 43/  0][0/0/0][          0][0-0] // enum class type : integral_type { ... }
+# 117>            NEWLINE|               NONE|     PARENT_NOT_SET[ 43/ 43/  1/  0][0/0/0][          0][1-0]
+# 118>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
+# 118>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][      20000][0-0]      class
+# 118>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][          0][0-0]            e5
+# 118>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
+# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 25/  1][0/0/0][      e0000][0-0]                 unsigned
+# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][          0][0-0]                          int
+# 118>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 30/ 30/ 31/  1][0/0/0][  240000000][0-0]                              {
+# 118>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 32/ 34/  1][1/1/0][   400c0004][0-0]                                a5
+# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 34/ 34/ 35/  0][1/1/0][  240000004][0-0]                                  ,
+# 118>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 38/  1][1/1/0][   40080004][0-0]                                    b5
+# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 38/ 38/ 39/  0][1/1/0][  240000004][0-0]                                      ,
+# 118>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 42/  1][1/1/0][   40080004][0-0]                                        d5
+# 118>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 43/ 43/ 44/  1][0/0/0][  240000004][0-0]                                           }
+# 118>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][  200000000][0-0]                                            ;
+# 118>            NEWLINE|               NONE|     PARENT_NOT_SET[ 45/ 45/  1/  0][0/0/0][          0][2-0]
+# 120>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 35/  0][0/0/0][          0][0-0] // enum class type : integral_type
+# 120>            NEWLINE|               NONE|     PARENT_NOT_SET[ 35/ 35/  1/  0][0/0/0][          0][1-0]
+# 121>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
+# 121>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][100000020000][0-0]      class
+# 121>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][100000000000][0-0]            e6
+# 121>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
+# 121>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 22/  1][0/0/0][      c0000][0-0]                 short
+# 121>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ;
+# 121>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][          0][2-0]
+# 123>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 19/  0][0/0/0][          0][0-0] // enum class type
+# 123>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/0][          0][1-0]
+# 124>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
+# 124>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][100000020000][0-0]      class
+# 124>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][100000000000][0-0]            e7
+# 124>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][  200000000][0-0]              ;
+# 124>            NEWLINE|               NONE|     PARENT_NOT_SET[ 15/ 15/  1/  0][0/0/0][          0][2-0]
+# 126>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 39/  0][0/0/0][          0][0-0] // enum : integral_type { ... } x, ...
+# 126>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][          0][1-0]
+# 127>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      c0000][0-0] enum
+# 127>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][  200000000][0-0]      :
+# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[  8/  8/ 12/  1][0/0/0][      e0000][0-0]        long
+# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 13/ 13/ 17/  1][0/0/0][          0][0-0]             long
+# 127>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 18/ 18/ 19/  1][0/0/0][  240000000][0-0]                  {
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 20/ 20/ 22/  1][1/1/0][   400c0004][0-0]                    a8
+# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][1/1/0][  240000004][0-0]                      ,
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][1/1/0][   40080004][0-0]                        b8
+# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 26/ 26/ 27/  0][1/1/0][  240000004][0-0]                          ,
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  1][1/1/0][   40080004][0-0]                            c8
+# 127>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  240000004][0-0]                               }
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 36/  1][0/0/0][    70c0000][0-0]                                 e81
+# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/0/0][  200000000][0-0]                                    ,
+# 127>               WORD|               NONE|     PARENT_NOT_SET[ 38/ 38/ 41/  1][0/0/0][    5080000][0-0]                                      e82
+# 127>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 41/ 41/ 42/  0][0/0/0][  200000000][0-0]                                         ;
+# 127>            NEWLINE|               NONE|     PARENT_NOT_SET[ 42/ 42/  1/  0][0/0/0][          0][2-0]
+# 129>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 23/  0][0/0/0][          0][0-0] // enum { ... } x, ...
+# 129>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][          0][1-0]
+# 130>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      c0000][0-0] enum
+# 130>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][  240000000][0-0]      {
+# 130>               WORD|               NONE|     PARENT_NOT_SET[  8/  8/ 10/  1][1/1/0][   400c0004][0-0]        a9
+# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][1/1/0][  240000004][0-0]          ,
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 12/ 12/ 14/  1][1/1/0][   40080004][0-0]            b9
+# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 14/ 14/ 15/  0][1/1/0][  240000004][0-0]              ,
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 16/ 16/ 18/  1][1/1/0][   40080004][0-0]                c9
+# 130>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 19/ 19/ 20/  1][0/0/0][  240000004][0-0]                   }
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][    70c0000][0-0]                     e91
+# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][  200000000][0-0]                        ,
+# 130>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][    5080000][0-0]                          e92
+# 130>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 29/ 29/ 30/  0][0/0/0][  200000000][0-0]                             ;
+# 130>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 30/  1/  0][0/0/0][          0][2-0]
+# 132>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] union
+# 132>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
+# 132>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][     800000][0-0]                  u1
+# 132>         BRACE_OPEN|              UNION|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][  240000000][0-0]                     {
+# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 23/ 23/ 26/  1][1/1/0][   408e0000][0-0]                       int
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][1/1/0][   43000000][0-0]                           x
+# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][  240000000][0-0]                            ;
+# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 30/ 30/ 34/  1][1/1/0][   408e0000][0-0]                              long
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  1][1/1/0][   43000000][0-0]                                   y
+# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][1/1/0][  240000000][0-0]                                    ;
+# 132>        BRACE_CLOSE|              UNION|     PARENT_NOT_SET[ 38/ 38/ 39/  1][0/0/0][  240000000][0-0]                                      }
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 43/  1][0/0/0][    70c0000][0-0]                                        u11
+# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][  200000000][0-0]                                           ,
+# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 45/ 45/ 46/  1][0/0/0][  200080000][0-0]                                             *
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  0][0/0/0][   25080000][0-0]                                              u12
+# 132>             ASSIGN|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  1][0/0/0][  200000000][0-0]                                                  =
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 59/  1][0/0/0][      80000][0-0]                                                    nullptr
+# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           ,
+# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 61/ 61/ 62/  1][0/0/0][  200080000][0-0]                                                             *
+# 132>               WORD|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/0/0][   25080000][0-0]                                                              u13
+# 132>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][  240000000][0-0]                                                                 {
+# 132>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  0][1/1/0][   400c0000][0-0]                                                                  0
+# 132>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  240000000][0-0]                                                                   }
+# 132>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][  200000000][0-0]                                                                    ;
+# 132>            NEWLINE|               NONE|     PARENT_NOT_SET[ 69/ 69/  1/  0][0/0/0][          0][2-0]
+# 134>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] union
+# 134>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
+# 134>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][     820000][0-0]                  u1
+# 134>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][    3000000][0-0]                     u21
+# 134>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][  200000000][0-0]                        ;
+# 134>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 25/  1/  0][0/0/0][          0][1-0]
+# -=====-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/help.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/help.txt
index 0d4891ea..1348030e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/help.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/help.txt
@@ -51,13 +51,13 @@ Config/Help Options:
  --set <option>=<value>   : Sets a new value to a config option.
 
 Debug Options:
- -p FILE            : Dump debug info into FILE, or to stdout if FILE is set to '-'.
-                      Must be used in combination with '-f FILE'.
- --debug-csv-format : Dump debug info to file in csv-delimited format.
-                      Must be used in combination with '-p FILE', where FILE is not set to '-'
- -L SEV             : Set the log severity (see log_levels.h; note 'A' = 'all')
- -s                 : Show the log severity in the logs.
- --decode           : Decode remaining args (chunk flags) and exit.
+ -p FILE               : Dump debug info into FILE, or to stdout if FILE is set to '-'.
+                         Must be used in combination with '-f FILE'
+ -L SEV                : Set the log severity (see log_levels.h; note 'A' = 'all')
+ -s                    : Show the log severity in the logs.
+ --decode              : Decode remaining args (chunk flags) and exit.
+ --tracking_space FILE : Prepare tracking informations for debugging.
+                         Cannot be used with the -o option'
 
 Usage Examples
 cat foo.d | uncrustify -q -c my.cfg -l d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/logger_cs_L_99.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/logger_cs_L_99.txt
index e839831f..e839831f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/logger_cs_L_99.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/logger_cs_L_99.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_d_error.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_error.txt
index ac1e7302..ac1e7302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_d_error.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_error.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_d_uc.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_uc.txt
index 4a046c3f..9d7d5c7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_d_uc.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_uc.txt
@@ -10,18 +10,17 @@ disable_processing_nl_cont      = false
 disable_processing_cmt          = " *INDENT-OFF*"
 enable_processing_cmt           = " *INDENT-ON*"
 enable_digraphs                 = false
+processing_cmt_as_regex         = false
 utf8_bom                        = ignore
 utf8_byte                       = false
 utf8_force                      = false
-sp_do_brace_open                = ignore
-sp_brace_close_while            = ignore
-sp_while_paren_open             = ignore
 sp_arith                        = ignore
 sp_arith_additive               = ignore
 sp_assign                       = ignore
 sp_cpp_lambda_assign            = ignore
 sp_cpp_lambda_square_paren      = ignore
 sp_cpp_lambda_square_brace      = ignore
+sp_cpp_lambda_argument_list     = ignore
 sp_cpp_lambda_paren_brace       = ignore
 sp_cpp_lambda_fparen            = ignore
 sp_assign_default               = ignore
@@ -77,6 +76,9 @@ sp_inside_sparen_open           = ignore
 sp_inside_sparen_close          = ignore
 sp_after_sparen                 = ignore
 sp_sparen_brace                 = ignore
+sp_do_brace_open                = ignore
+sp_brace_close_while            = ignore
+sp_while_paren_open             = ignore
 sp_invariant_paren              = ignore
 sp_after_invariant_paren        = ignore
 sp_special_semi                 = ignore
@@ -223,6 +225,7 @@ sp_after_for_colon              = ignore
 sp_before_for_colon             = ignore
 sp_extern_paren                 = ignore
 sp_cmt_cpp_start                = ignore
+sp_cmt_cpp_region               = ignore
 sp_cmt_cpp_doxygen              = false
 sp_cmt_cpp_qttr                 = false
 sp_endif_cmt                    = ignore
@@ -263,6 +266,7 @@ indent_namespace_level          = 0
 indent_namespace_limit          = 0
 indent_extern                   = false
 indent_class                    = false
+indent_before_class_colon       = 0
 indent_class_colon              = false
 indent_class_on_colon           = false
 indent_constr_colon             = false
@@ -290,10 +294,10 @@ indent_sing_line_comments       = 0
 indent_sparen_extra             = 0
 indent_relative_single_line_comments = false
 indent_switch_case              = 0
+indent_case_brace               = 0
 indent_switch_break_with_case   = false
 indent_switch_pp                = true
 indent_case_shift               = 0
-indent_case_brace               = 0
 indent_col1_comment             = false
 indent_col1_multi_string_literal = false
 indent_label                    = 1
@@ -304,6 +308,7 @@ indent_paren_close              = 0
 indent_paren_after_func_def     = false
 indent_paren_after_func_decl    = false
 indent_paren_after_func_call    = false
+indent_comma_brace              = false
 indent_comma_paren              = false
 indent_bool_paren               = false
 indent_semicolon_for_paren      = false
@@ -347,6 +352,7 @@ nl_func_leave_one_liners        = false
 nl_cpp_lambda_leave_one_liners  = false
 nl_if_leave_one_liners          = false
 nl_while_leave_one_liners       = false
+nl_do_leave_one_liners          = false
 nl_for_leave_one_liners         = false
 nl_oc_msg_leave_one_liner       = false
 nl_oc_mdef_brace                = ignore
@@ -650,8 +656,12 @@ align_oc_decl_colon             = false
 align_oc_msg_colon_xcode_like   = false
 cmt_width                       = 0
 cmt_reflow_mode                 = 0
+cmt_reflow_fold_regex_file      = ""
+cmt_reflow_indent_to_paragraph_start = false
 cmt_convert_tab_to_spaces       = false
 cmt_indent_multi                = true
+cmt_align_doxygen_javadoc_tags  = false
+cmt_sp_before_doxygen_javadoc_tags = 1
 cmt_c_group                     = false
 cmt_c_nl_start                  = false
 cmt_c_nl_end                    = false
@@ -741,5 +751,6 @@ warn_level_tabs_found_in_verbatim_string_literals = 2
 debug_max_number_of_loops       = 0
 debug_line_number_to_protocol   = 0
 debug_timeout                   = 0
+debug_truncate                  = 0
 # option(s) with 'not default' value: 0
 #
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_d_ucwd.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_ucwd.txt
index e34b2693..f220a918 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_d_ucwd.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_d_ucwd.txt
@@ -37,18 +37,16 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
 disable_processing_nl_cont      = false    # true/false
 
 # Specify the marker used in comments to disable processing of part of the
 # file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *INDENT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *INDENT-ON*"     # string
@@ -56,8 +54,14 @@ enable_processing_cmt           = " *INDENT-ON*"     # string
 # Enable parsing of digraphs.
 enable_digraphs                 = false    # true/false
 
+# Option to allow both disable_processing_cmt and enable_processing_cmt
+# strings, if specified, to be interpreted as ECMAScript regular expressions.
+# If true, a regex search will be performed within comments according to the
+# specified patterns in order to disable/enable processing.
+processing_cmt_as_regex         = false    # true/false
+
 # Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
 
 # If the file contains bytes with values between 128 and 255, but is not
 # UTF-8, then output as UTF-8.
@@ -66,179 +70,175 @@ utf8_byte                       = false    # true/false
 # Force the output encoding to UTF-8.
 utf8_force                      = false    # true/false
 
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'while' and '('.
-sp_while_paren_open             = ignore   # ignore/add/remove/force
-
 #
 # Spacing options
 #
 
 # Add or remove space around non-assignment symbolic operators ('+', '/', '%',
 # '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
+sp_arith                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around arithmetic operators '+' and '-'.
 #
 # Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
+sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
+sp_assign                       = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda when
 # an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda with
 # no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> int x <here> ){ ... }'.
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the argument list of a C++11 lambda, as in
 # '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a lambda body and its call operator of an
 # immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=' in a prototype.
 #
 # If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
+sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
+sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
+sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
+sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
+sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around preprocessor '##' concatenation operator.
 #
 # Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
+sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
+sp_bool                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
+sp_compare                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
+sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
+sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
+sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to balance spaces inside nested parentheses.
 sp_balance_nested_parens        = false    # true/false
 
 # Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
+sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
+# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
+sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
+sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_block_caret        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_qualifier     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a pointer star '*', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
+sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after reference sign '&', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
+sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a reference sign '&', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
+sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -251,50 +251,49 @@ sp_before_byref_func            = ignore   # ignore/add/remove/force
 # following word.
 #
 # Default: force
-sp_after_type                   = force    # ignore/add/remove/force
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
+# Add or remove space between 'decltype(...)' and word,
+# brace or function call.
+sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
 
 # (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_template_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_template_angle               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
+sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
+sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
+sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
+sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
+sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_angle_word                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '>' in '>>' (template stuff).
 #
 # Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
 
 # (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
 # that sp_angle_shift cannot remove the space without this option.
@@ -302,632 +301,648 @@ sp_permit_cpp11_shift           = false    # true/false
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
+sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '(' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ')' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
+sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
+sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
+sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
+sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';'.
 #
 # Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
+sp_after_semi                   = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
 # Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
 
 # 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_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
+sp_before_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for a variable definition.
 #
 # Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
+sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
+sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
+sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # (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_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ','.
 #
 # Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between an open parenthesis and comma,
 # i.e. '(,' vs. '( ,'.
 #
 # Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
+sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
+sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
+sp_type_question                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
+sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
+sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
+sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
+sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before case ':'.
 #
 # Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
+sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_operator_sym           = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_cast                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
+sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
+sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
+sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_func                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
+sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_tparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
+sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of a function call in object
 # initialization.
 #
 # Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_user_paren         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
 
 # 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_paren_paren   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a constructor/destructor and the open
 # parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
+sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
+sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
+sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
+sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
+sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space before Objective-C protocol list
 # as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'super' and '(' in 'super (something)'.
 #
 # Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'this' and '(' in 'this (something)'.
 #
 # Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
+sp_macro                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
+sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
+sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
+sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
+sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
+sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
+sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
+sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for C++ uniform
 # initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # 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                = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
+sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
+sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '!' (not) unary operator.
 #
 # Default: remove
-sp_not                          = remove   # ignore/add/remove/force
+sp_not                          = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
 
 # 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                         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
 # Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+sp_member                       = remove   # ignore/add/remove/force/not_defined
 
 # 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                        = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
 #
 # Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
 
 # 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                       = remove   # ignore/add/remove/force/not_defined
 
 # 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               = add      # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
+sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var : <here> expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var <here> : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
+# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 
-# 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
+# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
+# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+# A region marker is defined as a comment which is not preceded by other text
+# (i.e. the comment is the first non-whitespace on the line), and which starts
+# with either 'BEGIN' or 'END'.
+#
+# Overrides sp_cmt_cpp_start.
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+
+# If true, space 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 '//~'.
+# If true, space 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
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
+sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
+sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
+sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # If true, vbrace tokens are dropped to the previous token and skipped.
 sp_skip_vbrace_tokens           = false    # true/false
 
 # Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
+sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
+sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
@@ -1031,6 +1046,12 @@ indent_extern                   = false    # true/false
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Additional indent before the leading base class colon.
+# Negative values decrease indent down to the first column.
+# Requires a newline break before colon (see pos_class_colon
+# and nl_class_colon)
+indent_before_class_colon       = 0        # number
+
 # Whether to indent the stuff after a leading base class colon.
 indent_class_colon              = false    # true/false
 
@@ -1142,8 +1163,14 @@ indent_sparen_extra             = 0        # number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# It might wise to choose the same value for the option indent_case_brace.
 indent_switch_case              = 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.
+# It might wise to choose the same value for the option indent_switch_case.
+indent_case_brace               = 0        # number
+
 # indent 'break' with 'case' from 'switch'.
 indent_switch_break_with_case   = false    # true/false
 
@@ -1156,10 +1183,6 @@ indent_switch_pp                = true     # true/false
 # 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.
-indent_case_brace               = 0        # number
-
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
@@ -1210,6 +1233,10 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
+# Whether to indent a comma when inside a brace.
+# If true, aligns under the open brace.
+indent_comma_brace              = false    # true/false
+
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
 indent_comma_paren              = false    # true/false
@@ -1316,10 +1343,10 @@ indent_token_after_brace        = true     # true/false
 indent_cpp_lambda_body          = false    # true/false
 
 # How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
+# true: add both the indent from return & the compound literal open brace
+#       (i.e. 2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only
+#        add the indent for the return.
 #
 # Default: true
 indent_compound_literal_return  = true     # true/false
@@ -1336,7 +1363,7 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
-# Whether to indent the statments inside ternary operator.
+# Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
 
 # If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
@@ -1392,6 +1419,9 @@ nl_if_leave_one_liners          = false    # true/false
 # Don't split one-line while statements, as in 'while(...) b++;'.
 nl_while_leave_one_liners       = false    # true/false
 
+# Don't split one-line do statements, as in 'do { b++; } while(...);'.
+nl_do_leave_one_liners          = false    # true/false
+
 # Don't split one-line for statements, as in 'for(...) b++;'.
 nl_for_leave_one_liners         = false    # true/false
 
@@ -1399,166 +1429,166 @@ nl_for_leave_one_liners         = false    # true/false
 nl_oc_msg_leave_one_liner       = false    # true/false
 
 # (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
+nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline after '= ['. Will also affect the newline before
 # the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
+nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
+nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
+nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
+nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
+nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
+nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
+nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
+nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
+nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
+nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
+nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
+nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
+nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
+nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
+nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
+nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline between ')' and '{' if the ')' is on a different line than the
 # if/for/etc.
@@ -1569,11 +1599,11 @@ nl_multi_line_cond              = false    # true/false
 
 # Add a newline after '(' if an if/for/while/switch condition spans multiple
 # lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline before ')' if an if/for/while/switch condition spans multiple
 # lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
 
 # Force a newline in a define after the macro name for multi-line defines.
 nl_multi_line_define            = false    # true/false
@@ -1588,141 +1618,141 @@ nl_after_case                   = false    # true/false
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
+nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
+nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
+nl_template_class               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class declaration.
 #
 # Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
+nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class declaration.
 #
 # Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class definition.
 #
 # Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
+nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class definition.
 #
 # Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
+nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
+nl_template_func                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # declaration.
 #
 # Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
+nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # declaration.
 #
 # Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # definition.
 #
 # Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
+nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # definition.
 #
 # Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
+nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
+nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'template<...>' and 'using' of a templated
 # type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
+nl_template_using               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
+nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before or after (depending on pos_class_comma,
 # may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
+nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between return type and function name in a function
 # definition.
 # might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
+nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_name_class         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_class_scope             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_scope_name              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
 
 # 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                   = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
+nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
 
 # 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               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # 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              = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
+nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
+nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
+nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1733,13 +1763,13 @@ nl_func_decl_start_multi_line   = false    # true/false
 nl_func_def_start_multi_line    = false    # true/false
 
 # Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
+nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
+nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
+nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1750,16 +1780,16 @@ nl_func_decl_args_multi_line    = false    # true/false
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
+nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1770,20 +1800,20 @@ nl_func_decl_end_multi_line     = false    # true/false
 nl_func_def_end_multi_line      = false    # true/false
 
 # Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call,
 # has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
+nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
+nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -1797,7 +1827,7 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
-# Whether to respect nl_func_call_XXX option incase of closure args.
+# Whether to respect nl_func_call_XXX option in case of closure args.
 nl_func_call_args_multi_line_ignore_closures = false    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
@@ -1814,36 +1844,36 @@ nl_template_end                 = false    # true/false
 nl_oc_msg_args                  = false    # true/false
 
 # Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
+nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between function signature and '{',
 # if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
 # (Java) Add or remove newline between the ')' and '{{' of the double brace
 # initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # 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          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_open     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '{'. This also adds a newline before the
 # matching '}'.
@@ -1872,7 +1902,7 @@ 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.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to alter newlines in '#define' macros.
 nl_define_macro                 = false    # true/false
@@ -1890,41 +1920,41 @@ nl_squeeze_ifdef                = false    # true/false
 nl_squeeze_ifdef_top_level      = false    # true/false
 
 # Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_if                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to put a blank line before 'return' statements, unless after an open
 # brace.
@@ -1935,10 +1965,10 @@ nl_before_return                = false    # true/false
 nl_after_return                 = false    # true/false
 
 # Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
+nl_before_member                = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
+nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to double-space commented-entries in 'struct'/'union'/'enum'.
 nl_ds_struct_enum_cmt           = false    # true/false
@@ -1949,11 +1979,11 @@ nl_ds_struct_enum_close_brace   = false    # true/false
 
 # 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_class_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -1977,9 +2007,8 @@ nl_create_while_one_liner       = false    # true/false
 # a single line.
 nl_create_func_def_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.
+# Whether to split one-line simple unbraced if statements into three lines by
+# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 nl_create_list_one_liner        = false    # true/false
 
 # Whether to split one-line simple unbraced if statements into two lines by
@@ -2009,13 +2038,16 @@ nl_max                          = 0        # unsigned number
 nl_max_blank_in_func            = 0        # unsigned number
 
 # The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
+# This option overrides eat_blanks_after_open_brace and
+# eat_blanks_before_close_brace, but is ignored when
+# nl_collapse_empty_body=true
 nl_inside_empty_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.
+# The number of newlines before a multi-line function definition. Where
+# applicable, this option is overridden with eat_blanks_after_open_brace=true
 nl_before_func_body_def         = 0        # unsigned number
 
 # The number of newlines before a class constructor/destructor prototype.
@@ -2183,7 +2215,7 @@ nl_around_cs_property           = 0        # unsigned number
 nl_between_get_set              = 0        # unsigned number
 
 # (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
+nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove blank lines after '{'.
 eat_blanks_after_open_brace     = false    # true/false
@@ -2200,10 +2232,10 @@ nl_remove_extra_newlines        = 0        # unsigned number
 
 # (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
+nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
+nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
 
 # The number of newlines before a whole-file #ifdef.
 #
@@ -2617,9 +2649,44 @@ cmt_width                       = 0        # unsigned number
 #
 # 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
 # 1: No touching at all
-# 2: Full reflow
+# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
 cmt_reflow_mode                 = 0        # unsigned number
 
+# Path to a file that contains regular expressions describing patterns for
+# which the end of one line and the beginning of the next will be folded into
+# the same sentence or paragraph during full comment reflow. The regular
+# expressions are described using ECMAScript syntax. The syntax for this
+# specification is as follows, where "..." indicates the custom regular
+# expression and "n" indicates the nth end_of_prev_line_regex and
+# beg_of_next_line_regex regular expression pair:
+#
+# end_of_prev_line_regex[1] = "...$"
+# beg_of_next_line_regex[1] = "^..."
+# end_of_prev_line_regex[2] = "...$"
+# beg_of_next_line_regex[2] = "^..."
+#             .
+#             .
+#             .
+# end_of_prev_line_regex[n] = "...$"
+# beg_of_next_line_regex[n] = "^..."
+#
+# Note that use of this option overrides the default reflow fold regular
+# expressions, which are internally defined as follows:
+#
+# end_of_prev_line_regex[1] = "[\w,\]\)]$"
+# beg_of_next_line_regex[1] = "^[\w,\[\(]"
+# end_of_prev_line_regex[2] = "\.$"
+# beg_of_next_line_regex[2] = "^[A-Z]"
+cmt_reflow_fold_regex_file      = ""         # string
+
+# Whether to indent wrapped lines to the start of the encompassing paragraph
+# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+# specified by cmt_sp_after_star_cont.
+#
+# Note that cmt_align_doxygen_javadoc_tags overrides this option for
+# paragraphs associated with javadoc tags
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+
 # 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
@@ -2630,6 +2697,22 @@ cmt_convert_tab_to_spaces       = false    # true/false
 # Default: true
 cmt_indent_multi                = true     # true/false
 
+# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+# and corresponding fields such that groups of consecutive block tags,
+# parameter names, and descriptions align with one another. Overrides that
+# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+# in order to achieve the desired alignment for line-wrapping.
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+
+# The number of spaces to insert after the star and before doxygen
+# javadoc-style tags (@param, @return, etc). Requires enabling
+# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+# cmt_sp_after_star_cont.
+#
+# Default: 1
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+
 # Whether to group c-comments that look like they are in a block.
 cmt_c_group                     = false    # true/false
 
@@ -2736,17 +2819,17 @@ cmt_insert_before_ctor_dtor     = false    # true/false
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
+mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
+mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
+mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_if               = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -2762,10 +2845,10 @@ mod_full_brace_if_chain         = false    # true/false
 mod_full_brace_if_chain_only    = false    # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
+mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
+mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl               = 0        # unsigned number
@@ -2787,7 +2870,7 @@ mod_full_brace_nl               = 0        # unsigned number
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
 # Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
@@ -2862,14 +2945,14 @@ mod_move_case_break             = false    # true/false
 
 # 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_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
@@ -2904,7 +2987,7 @@ mod_sort_oc_property_nullability_weight = 0        # number
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Whether to indent #if/#else/#endif at the brace level. If false, these are
 # indented from column 1.
@@ -2919,7 +3002,7 @@ pp_indent_at_level              = false    # true/false
 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
+pp_space                        = ignore   # ignore/add/remove/force/not_defined
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 0        # unsigned number
@@ -3042,9 +3125,8 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
+# If true: the form feed character is removed from the list of whitespace
+# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
 use_form_feed_no_more_as_whitespace_character = false    # true/false
 
 #
@@ -3072,6 +3154,10 @@ debug_line_number_to_protocol   = 0        # number
 # only for linux
 debug_timeout                   = 0        # number
 
+# Set the number of characters to be printed if the text is too long,
+# 0: do not truncate.
+debug_truncate                  = 0        # unsigned number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_nd_uc.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_uc.txt
index d90db681..4203df78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_nd_uc.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_uc.txt
@@ -10,18 +10,17 @@ disable_processing_nl_cont      = false
 disable_processing_cmt          = " *INDENT-OFF*"
 enable_processing_cmt           = " *INDENT-ON*"
 enable_digraphs                 = false
+processing_cmt_as_regex         = false
 utf8_bom                        = ignore
 utf8_byte                       = false
 utf8_force                      = false
-sp_do_brace_open                = ignore
-sp_brace_close_while            = ignore
-sp_while_paren_open             = ignore
 sp_arith                        = ignore
 sp_arith_additive               = ignore
 sp_assign                       = ignore
 sp_cpp_lambda_assign            = ignore
 sp_cpp_lambda_square_paren      = ignore
 sp_cpp_lambda_square_brace      = ignore
+sp_cpp_lambda_argument_list     = ignore
 sp_cpp_lambda_paren_brace       = ignore
 sp_cpp_lambda_fparen            = ignore
 sp_assign_default               = ignore
@@ -77,6 +76,9 @@ sp_inside_sparen_open           = ignore
 sp_inside_sparen_close          = ignore
 sp_after_sparen                 = ignore
 sp_sparen_brace                 = ignore
+sp_do_brace_open                = ignore
+sp_brace_close_while            = ignore
+sp_while_paren_open             = ignore
 sp_invariant_paren              = ignore
 sp_after_invariant_paren        = ignore
 sp_special_semi                 = ignore
@@ -223,6 +225,7 @@ sp_after_for_colon              = ignore
 sp_before_for_colon             = ignore
 sp_extern_paren                 = ignore
 sp_cmt_cpp_start                = ignore
+sp_cmt_cpp_region               = ignore
 sp_cmt_cpp_doxygen              = false
 sp_cmt_cpp_qttr                 = false
 sp_endif_cmt                    = ignore
@@ -263,6 +266,7 @@ indent_namespace_level          = 0
 indent_namespace_limit          = 0
 indent_extern                   = false
 indent_class                    = false
+indent_before_class_colon       = 0
 indent_class_colon              = false
 indent_class_on_colon           = false
 indent_constr_colon             = false
@@ -290,10 +294,10 @@ indent_sing_line_comments       = 0
 indent_sparen_extra             = 0
 indent_relative_single_line_comments = false
 indent_switch_case              = 0
+indent_case_brace               = 0
 indent_switch_break_with_case   = false
 indent_switch_pp                = true
 indent_case_shift               = 0
-indent_case_brace               = 0
 indent_col1_comment             = false
 indent_col1_multi_string_literal = false
 indent_label                    = 1
@@ -304,6 +308,7 @@ indent_paren_close              = 0
 indent_paren_after_func_def     = false
 indent_paren_after_func_decl    = false
 indent_paren_after_func_call    = false
+indent_comma_brace              = false
 indent_comma_paren              = false
 indent_bool_paren               = false
 indent_semicolon_for_paren      = false
@@ -347,6 +352,7 @@ nl_func_leave_one_liners        = false
 nl_cpp_lambda_leave_one_liners  = false
 nl_if_leave_one_liners          = false
 nl_while_leave_one_liners       = false
+nl_do_leave_one_liners          = false
 nl_for_leave_one_liners         = false
 nl_oc_msg_leave_one_liner       = false
 nl_oc_mdef_brace                = ignore
@@ -650,8 +656,12 @@ align_oc_decl_colon             = false
 align_oc_msg_colon_xcode_like   = false
 cmt_width                       = 0
 cmt_reflow_mode                 = 0
+cmt_reflow_fold_regex_file      = ""
+cmt_reflow_indent_to_paragraph_start = false
 cmt_convert_tab_to_spaces       = false
 cmt_indent_multi                = true
+cmt_align_doxygen_javadoc_tags  = false
+cmt_sp_before_doxygen_javadoc_tags = 1
 cmt_c_group                     = false
 cmt_c_nl_start                  = false
 cmt_c_nl_end                    = false
@@ -741,5 +751,6 @@ warn_level_tabs_found_in_verbatim_string_literals = 2
 debug_max_number_of_loops       = 0
 debug_line_number_to_protocol   = 0
 debug_timeout                   = 0
+debug_truncate                  = 0
 # option(s) with 'not default' value: 1
 #
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_nd_ucwd.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_ucwd.txt
index d7dc6333..b160b09d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/mini_nd_ucwd.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/mini_nd_ucwd.txt
@@ -37,18 +37,16 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
 disable_processing_nl_cont      = false    # true/false
 
 # Specify the marker used in comments to disable processing of part of the
 # file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *INDENT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *INDENT-ON*"     # string
@@ -56,8 +54,14 @@ enable_processing_cmt           = " *INDENT-ON*"     # string
 # Enable parsing of digraphs.
 enable_digraphs                 = false    # true/false
 
+# Option to allow both disable_processing_cmt and enable_processing_cmt
+# strings, if specified, to be interpreted as ECMAScript regular expressions.
+# If true, a regex search will be performed within comments according to the
+# specified patterns in order to disable/enable processing.
+processing_cmt_as_regex         = false    # true/false
+
 # Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
 
 # If the file contains bytes with values between 128 and 255, but is not
 # UTF-8, then output as UTF-8.
@@ -66,179 +70,175 @@ utf8_byte                       = false    # true/false
 # Force the output encoding to UTF-8.
 utf8_force                      = false    # true/false
 
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'while' and '('.
-sp_while_paren_open             = ignore   # ignore/add/remove/force
-
 #
 # Spacing options
 #
 
 # Add or remove space around non-assignment symbolic operators ('+', '/', '%',
 # '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
+sp_arith                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around arithmetic operators '+' and '-'.
 #
 # Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
+sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
+sp_assign                       = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda when
 # an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda with
 # no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> int x <here> ){ ... }'.
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the argument list of a C++11 lambda, as in
 # '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a lambda body and its call operator of an
 # immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=' in a prototype.
 #
 # If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
+sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
+sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
+sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
+sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
+sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around preprocessor '##' concatenation operator.
 #
 # Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
+sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
+sp_bool                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
+sp_compare                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
+sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
+sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
+sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to balance spaces inside nested parentheses.
 sp_balance_nested_parens        = false    # true/false
 
 # Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
+sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
+# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
+sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
+sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_block_caret        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_qualifier     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a pointer star '*', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
+sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after reference sign '&', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
+sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a reference sign '&', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
+sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -251,50 +251,49 @@ sp_before_byref_func            = ignore   # ignore/add/remove/force
 # following word.
 #
 # Default: force
-sp_after_type                   = force    # ignore/add/remove/force
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
+# Add or remove space between 'decltype(...)' and word,
+# brace or function call.
+sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
 
 # (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_template_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_template_angle               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
+sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
+sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
+sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
+sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
+sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_angle_word                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '>' in '>>' (template stuff).
 #
 # Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
 
 # (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
 # that sp_angle_shift cannot remove the space without this option.
@@ -302,632 +301,648 @@ sp_permit_cpp11_shift           = false    # true/false
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
+sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '(' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ')' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
+sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
+sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
+sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
+sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';'.
 #
 # Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
+sp_after_semi                   = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
 # Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
 
 # 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_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
+sp_before_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for a variable definition.
 #
 # Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
+sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
+sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
+sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # (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_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ','.
 #
 # Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between an open parenthesis and comma,
 # i.e. '(,' vs. '( ,'.
 #
 # Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
+sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
+sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
+sp_type_question                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
+sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
+sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
+sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
+sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before case ':'.
 #
 # Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
+sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_operator_sym           = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_cast                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
+sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
+sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
+sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_func                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
+sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_tparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
+sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of a function call in object
 # initialization.
 #
 # Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_user_paren         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
 
 # 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_paren_paren   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a constructor/destructor and the open
 # parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
+sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
+sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
+sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
+sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
+sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space before Objective-C protocol list
 # as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'super' and '(' in 'super (something)'.
 #
 # Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'this' and '(' in 'this (something)'.
 #
 # Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
+sp_macro                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
+sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
+sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
+sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
+sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
+sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
+sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
+sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for C++ uniform
 # initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # 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                = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
+sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
+sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '!' (not) unary operator.
 #
 # Default: remove
-sp_not                          = remove   # ignore/add/remove/force
+sp_not                          = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
 
 # 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                         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
 # Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+sp_member                       = remove   # ignore/add/remove/force/not_defined
 
 # 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                        = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
 #
 # Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
 
 # 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                       = remove   # ignore/add/remove/force/not_defined
 
 # 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               = add      # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
+sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var : <here> expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var <here> : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
+# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 
-# 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
+# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
+# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+# A region marker is defined as a comment which is not preceded by other text
+# (i.e. the comment is the first non-whitespace on the line), and which starts
+# with either 'BEGIN' or 'END'.
+#
+# Overrides sp_cmt_cpp_start.
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+
+# If true, space 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 '//~'.
+# If true, space 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
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
+sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
+sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
+sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # If true, vbrace tokens are dropped to the previous token and skipped.
 sp_skip_vbrace_tokens           = false    # true/false
 
 # Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
+sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
+sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
@@ -1031,6 +1046,12 @@ indent_extern                   = false    # true/false
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Additional indent before the leading base class colon.
+# Negative values decrease indent down to the first column.
+# Requires a newline break before colon (see pos_class_colon
+# and nl_class_colon)
+indent_before_class_colon       = 0        # number
+
 # Whether to indent the stuff after a leading base class colon.
 indent_class_colon              = false    # true/false
 
@@ -1142,8 +1163,14 @@ indent_sparen_extra             = 0        # number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# It might wise to choose the same value for the option indent_case_brace.
 indent_switch_case              = 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.
+# It might wise to choose the same value for the option indent_switch_case.
+indent_case_brace               = 0        # number
+
 # indent 'break' with 'case' from 'switch'.
 indent_switch_break_with_case   = false    # true/false
 
@@ -1156,10 +1183,6 @@ indent_switch_pp                = true     # true/false
 # 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.
-indent_case_brace               = 0        # number
-
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
@@ -1210,6 +1233,10 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
+# Whether to indent a comma when inside a brace.
+# If true, aligns under the open brace.
+indent_comma_brace              = false    # true/false
+
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
 indent_comma_paren              = false    # true/false
@@ -1316,10 +1343,10 @@ indent_token_after_brace        = true     # true/false
 indent_cpp_lambda_body          = false    # true/false
 
 # How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
+# true: add both the indent from return & the compound literal open brace
+#       (i.e. 2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only
+#        add the indent for the return.
 #
 # Default: true
 indent_compound_literal_return  = true     # true/false
@@ -1336,7 +1363,7 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
-# Whether to indent the statments inside ternary operator.
+# Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
 
 # If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
@@ -1392,6 +1419,9 @@ nl_if_leave_one_liners          = false    # true/false
 # Don't split one-line while statements, as in 'while(...) b++;'.
 nl_while_leave_one_liners       = false    # true/false
 
+# Don't split one-line do statements, as in 'do { b++; } while(...);'.
+nl_do_leave_one_liners          = false    # true/false
+
 # Don't split one-line for statements, as in 'for(...) b++;'.
 nl_for_leave_one_liners         = false    # true/false
 
@@ -1399,166 +1429,166 @@ nl_for_leave_one_liners         = false    # true/false
 nl_oc_msg_leave_one_liner       = false    # true/false
 
 # (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
+nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline after '= ['. Will also affect the newline before
 # the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
+nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
+nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
+nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
+nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
+nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
+nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
+nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
+nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
+nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
+nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
+nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
+nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
+nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
+nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
+nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
+nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline between ')' and '{' if the ')' is on a different line than the
 # if/for/etc.
@@ -1569,11 +1599,11 @@ nl_multi_line_cond              = false    # true/false
 
 # Add a newline after '(' if an if/for/while/switch condition spans multiple
 # lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline before ')' if an if/for/while/switch condition spans multiple
 # lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
 
 # Force a newline in a define after the macro name for multi-line defines.
 nl_multi_line_define            = false    # true/false
@@ -1588,141 +1618,141 @@ nl_after_case                   = false    # true/false
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
+nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
+nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
+nl_template_class               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class declaration.
 #
 # Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
+nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class declaration.
 #
 # Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class definition.
 #
 # Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
+nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class definition.
 #
 # Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
+nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
+nl_template_func                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # declaration.
 #
 # Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
+nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # declaration.
 #
 # Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # definition.
 #
 # Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
+nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # definition.
 #
 # Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
+nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
+nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'template<...>' and 'using' of a templated
 # type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
+nl_template_using               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
+nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before or after (depending on pos_class_comma,
 # may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
+nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between return type and function name in a function
 # definition.
 # might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
+nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_name_class         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_class_scope             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_scope_name              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
 
 # 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                   = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
+nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
 
 # 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               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # 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              = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
+nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
+nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
+nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1733,13 +1763,13 @@ nl_func_decl_start_multi_line   = false    # true/false
 nl_func_def_start_multi_line    = false    # true/false
 
 # Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
+nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
+nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
+nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1750,16 +1780,16 @@ nl_func_decl_args_multi_line    = false    # true/false
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
+nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1770,20 +1800,20 @@ nl_func_decl_end_multi_line     = false    # true/false
 nl_func_def_end_multi_line      = false    # true/false
 
 # Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call,
 # has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
+nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
+nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -1797,7 +1827,7 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
-# Whether to respect nl_func_call_XXX option incase of closure args.
+# Whether to respect nl_func_call_XXX option in case of closure args.
 nl_func_call_args_multi_line_ignore_closures = false    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
@@ -1814,36 +1844,36 @@ nl_template_end                 = false    # true/false
 nl_oc_msg_args                  = false    # true/false
 
 # Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
+nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between function signature and '{',
 # if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
 # (Java) Add or remove newline between the ')' and '{{' of the double brace
 # initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # 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          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_open     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '{'. This also adds a newline before the
 # matching '}'.
@@ -1872,7 +1902,7 @@ 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.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to alter newlines in '#define' macros.
 nl_define_macro                 = false    # true/false
@@ -1890,41 +1920,41 @@ nl_squeeze_ifdef                = false    # true/false
 nl_squeeze_ifdef_top_level      = false    # true/false
 
 # Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_if                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to put a blank line before 'return' statements, unless after an open
 # brace.
@@ -1935,10 +1965,10 @@ nl_before_return                = false    # true/false
 nl_after_return                 = false    # true/false
 
 # Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
+nl_before_member                = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
+nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to double-space commented-entries in 'struct'/'union'/'enum'.
 nl_ds_struct_enum_cmt           = false    # true/false
@@ -1949,11 +1979,11 @@ nl_ds_struct_enum_close_brace   = false    # true/false
 
 # 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_class_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -1977,9 +2007,8 @@ nl_create_while_one_liner       = false    # true/false
 # a single line.
 nl_create_func_def_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.
+# Whether to split one-line simple unbraced if statements into three lines by
+# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 nl_create_list_one_liner        = false    # true/false
 
 # Whether to split one-line simple unbraced if statements into two lines by
@@ -2009,13 +2038,16 @@ nl_max                          = 0        # unsigned number
 nl_max_blank_in_func            = 0        # unsigned number
 
 # The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
+# This option overrides eat_blanks_after_open_brace and
+# eat_blanks_before_close_brace, but is ignored when
+# nl_collapse_empty_body=true
 nl_inside_empty_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.
+# The number of newlines before a multi-line function definition. Where
+# applicable, this option is overridden with eat_blanks_after_open_brace=true
 nl_before_func_body_def         = 0        # unsigned number
 
 # The number of newlines before a class constructor/destructor prototype.
@@ -2183,7 +2215,7 @@ nl_around_cs_property           = 0        # unsigned number
 nl_between_get_set              = 0        # unsigned number
 
 # (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
+nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove blank lines after '{'.
 eat_blanks_after_open_brace     = false    # true/false
@@ -2200,10 +2232,10 @@ nl_remove_extra_newlines        = 0        # unsigned number
 
 # (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
+nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
+nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
 
 # The number of newlines before a whole-file #ifdef.
 #
@@ -2617,9 +2649,44 @@ cmt_width                       = 0        # unsigned number
 #
 # 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
 # 1: No touching at all
-# 2: Full reflow
+# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
 cmt_reflow_mode                 = 0        # unsigned number
 
+# Path to a file that contains regular expressions describing patterns for
+# which the end of one line and the beginning of the next will be folded into
+# the same sentence or paragraph during full comment reflow. The regular
+# expressions are described using ECMAScript syntax. The syntax for this
+# specification is as follows, where "..." indicates the custom regular
+# expression and "n" indicates the nth end_of_prev_line_regex and
+# beg_of_next_line_regex regular expression pair:
+#
+# end_of_prev_line_regex[1] = "...$"
+# beg_of_next_line_regex[1] = "^..."
+# end_of_prev_line_regex[2] = "...$"
+# beg_of_next_line_regex[2] = "^..."
+#             .
+#             .
+#             .
+# end_of_prev_line_regex[n] = "...$"
+# beg_of_next_line_regex[n] = "^..."
+#
+# Note that use of this option overrides the default reflow fold regular
+# expressions, which are internally defined as follows:
+#
+# end_of_prev_line_regex[1] = "[\w,\]\)]$"
+# beg_of_next_line_regex[1] = "^[\w,\[\(]"
+# end_of_prev_line_regex[2] = "\.$"
+# beg_of_next_line_regex[2] = "^[A-Z]"
+cmt_reflow_fold_regex_file      = ""         # string
+
+# Whether to indent wrapped lines to the start of the encompassing paragraph
+# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+# specified by cmt_sp_after_star_cont.
+#
+# Note that cmt_align_doxygen_javadoc_tags overrides this option for
+# paragraphs associated with javadoc tags
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+
 # 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
@@ -2630,6 +2697,22 @@ cmt_convert_tab_to_spaces       = false    # true/false
 # Default: true
 cmt_indent_multi                = true     # true/false
 
+# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+# and corresponding fields such that groups of consecutive block tags,
+# parameter names, and descriptions align with one another. Overrides that
+# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+# in order to achieve the desired alignment for line-wrapping.
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+
+# The number of spaces to insert after the star and before doxygen
+# javadoc-style tags (@param, @return, etc). Requires enabling
+# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+# cmt_sp_after_star_cont.
+#
+# Default: 1
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+
 # Whether to group c-comments that look like they are in a block.
 cmt_c_group                     = false    # true/false
 
@@ -2736,17 +2819,17 @@ cmt_insert_before_ctor_dtor     = false    # true/false
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
+mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
+mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
+mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_if               = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -2762,10 +2845,10 @@ mod_full_brace_if_chain         = false    # true/false
 mod_full_brace_if_chain_only    = false    # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
+mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
+mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl               = 0        # unsigned number
@@ -2787,7 +2870,7 @@ mod_full_brace_nl               = 0        # unsigned number
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
 # Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
@@ -2862,14 +2945,14 @@ mod_move_case_break             = false    # true/false
 
 # 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_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
@@ -2904,7 +2987,7 @@ mod_sort_oc_property_nullability_weight = 0        # number
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Whether to indent #if/#else/#endif at the brace level. If false, these are
 # indented from column 1.
@@ -2919,7 +3002,7 @@ pp_indent_at_level              = false    # true/false
 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
+pp_space                        = ignore   # ignore/add/remove/force/not_defined
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 0        # unsigned number
@@ -3042,9 +3125,8 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
+# If true: the form feed character is removed from the list of whitespace
+# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
 use_form_feed_no_more_as_whitespace_character = false    # true/false
 
 #
@@ -3072,6 +3154,10 @@ debug_line_number_to_protocol   = 0        # number
 # only for linux
 debug_timeout                   = 0        # number
 
+# Set the number of characters to be printed if the text is too long,
+# 0: do not truncate.
+debug_truncate                  = 0        # unsigned number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/p.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/p.txt
index 2cb89026..f74c1cb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/p.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/p.txt
@@ -11,7 +11,7 @@ newlines                        = crlf
 #   1>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  2001c0001][0-0] #

 #   1>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/0][      20001][0-0]  define

 #   1>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 10/  1][1/1/0][      20001][0-0]         x

-#   1>               WORD|               NONE|     PARENT_NOT_SET[ 11/ 11/ 18/  1][1/1/0][      80001][0-0]           s23_foo

+#   1>               WORD|               NONE|     PARENT_NOT_SET[ 11/ 11/ 18/  1][1/1/0][      c0001][0-0]           s23_foo

 #   1>             ASSIGN|               NONE|     PARENT_NOT_SET[ 19/ 19/ 21/  1][1/1/0][  200000001][0-0]                   +=

 #   1>            NL_CONT|               NONE|     PARENT_NOT_SET[ 22/ 22/  1/  1][1/1/0][      80001][1-0]                      \

 #   2>               WORD|               NONE|     PARENT_NOT_SET[  9/  1/  7/  0][1/1/0][      80001][0-0]         s8_foo

@@ -19,8 +19,8 @@ newlines                        = crlf
 #   2>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 10/ 17/  1][1/1/0][      80001][0-0]                  s16_bar

 #   2>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 25/ 17/ 18/  0][1/1/0][  200000001][0-0]                         ;

 #   2>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 18/  1/  0][0/0/0][          0][2-0]

-#   4>             STRUCT|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][0/0/0][   200e0000][0-0] struct

-#   4>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/  8/ 21/  1][0/0/0][   20000000][0-0]        TelegramIndex

+#   4>             STRUCT|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][0/0/0][      e0000][0-0] struct

+#   4>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/  8/ 21/  1][0/0/0][          0][0-0]        TelegramIndex

 #   4>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/0][          0][1-0]

 #   5>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] {

 #   5>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][          2][1-0]

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/pc-.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/pc-.txt
index 63ed3d2c..63ed3d2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/pc-.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/pc-.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/show_config.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/show_config.txt
index e34b2693..f220a918 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/show_config.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/show_config.txt
@@ -37,18 +37,16 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
 disable_processing_nl_cont      = false    # true/false
 
 # Specify the marker used in comments to disable processing of part of the
 # file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *INDENT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *INDENT-ON*"     # string
@@ -56,8 +54,14 @@ enable_processing_cmt           = " *INDENT-ON*"     # string
 # Enable parsing of digraphs.
 enable_digraphs                 = false    # true/false
 
+# Option to allow both disable_processing_cmt and enable_processing_cmt
+# strings, if specified, to be interpreted as ECMAScript regular expressions.
+# If true, a regex search will be performed within comments according to the
+# specified patterns in order to disable/enable processing.
+processing_cmt_as_regex         = false    # true/false
+
 # Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
 
 # If the file contains bytes with values between 128 and 255, but is not
 # UTF-8, then output as UTF-8.
@@ -66,179 +70,175 @@ utf8_byte                       = false    # true/false
 # Force the output encoding to UTF-8.
 utf8_force                      = false    # true/false
 
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'while' and '('.
-sp_while_paren_open             = ignore   # ignore/add/remove/force
-
 #
 # Spacing options
 #
 
 # Add or remove space around non-assignment symbolic operators ('+', '/', '%',
 # '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
+sp_arith                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around arithmetic operators '+' and '-'.
 #
 # Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
+sp_arith_additive               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
+sp_assign                       = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda when
 # an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the capture specification of a C++11 lambda with
 # no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> int x <here> ){ ... }'.
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the argument list of a C++11 lambda, as in
 # '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a lambda body and its call operator of an
 # immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment operator '=' in a prototype.
 #
 # If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
+sp_assign_default               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
+sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after assignment operator '=', '+=', etc.
 #
 # Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
+sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
+sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
+sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around preprocessor '##' concatenation operator.
 #
 # Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
+sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around boolean operators '&&' and '||'.
-sp_bool                         = ignore   # ignore/add/remove/force
+sp_bool                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
+sp_compare                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')'.
-sp_inside_paren                 = ignore   # ignore/add/remove/force
+sp_inside_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
-sp_paren_paren                  = ignore   # ignore/add/remove/force
+sp_paren_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
+sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to balance spaces inside nested parentheses.
 sp_balance_nested_parens        = false    # true/false
 
 # Add or remove space between ')' and '{'.
-sp_paren_brace                  = ignore   # ignore/add/remove/force
+sp_paren_brace                  = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
+# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+sp_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
+sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between pointer stars '*'.
-sp_between_ptr_star             = ignore   # ignore/add/remove/force
+sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
+sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_block_caret        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_qualifier     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a pointer star '*', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
+sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after reference sign '&', if followed by a word.
 #
 # Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
+sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after a reference sign '&', if followed by a function
 # prototype or function definition.
 #
 # Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
+sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
@@ -251,50 +251,49 @@ sp_before_byref_func            = ignore   # ignore/add/remove/force
 # following word.
 #
 # Default: force
-sp_after_type                   = force    # ignore/add/remove/force
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
 
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
+# Add or remove space between 'decltype(...)' and word,
+# brace or function call.
+sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
 
 # (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_template_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_template_angle               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '<'.
-sp_before_angle                 = ignore   # ignore/add/remove/force
+sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<' and '>'.
-sp_inside_angle                 = ignore   # ignore/add/remove/force
+sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
+sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '>'.
-sp_after_angle                  = ignore   # ignore/add/remove/force
+sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
-sp_angle_paren                  = ignore   # ignore/add/remove/force
+sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_angle_word                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and '>' in '>>' (template stuff).
 #
 # Default: add
-sp_angle_shift                  = add      # ignore/add/remove/force
+sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
 
 # (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
 # that sp_angle_shift cannot remove the space without this option.
@@ -302,632 +301,648 @@ sp_permit_cpp11_shift           = false    # true/false
 
 # Add or remove space before '(' of control statements ('if', 'for', 'switch',
 # 'while', etc.).
-sp_before_sparen                = ignore   # ignore/add/remove/force
+sp_before_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '(' and ')' of control statements.
-sp_inside_sparen                = ignore   # ignore/add/remove/force
+sp_inside_sparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '(' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ')' of control statements.
 #
 # Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ')' of control statements.
-sp_after_sparen                 = ignore   # ignore/add/remove/force
+sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of of control statements.
-sp_sparen_brace                 = ignore   # ignore/add/remove/force
+sp_sparen_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+sp_while_paren_open             = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
+sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
+sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';'.
 #
 # Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ';' in non-empty 'for' statements.
-sp_before_semi_for              = ignore   # ignore/add/remove/force
+sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';', except when followed by a comment.
 #
 # Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
+sp_after_semi                   = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space after ';' in non-empty 'for' statements.
 #
 # Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
 
 # 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_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
+sp_before_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for a variable definition.
 #
 # Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before '[]'.
-sp_before_squares               = ignore   # ignore/add/remove/force
+sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before C++17 structured bindings.
-sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside a non-empty '[' and ']'.
-sp_inside_square                = ignore   # ignore/add/remove/force
+sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
+sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # (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_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_comma                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before ','.
 #
 # Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between an open parenthesis and comma,
 # i.e. '(,' vs. '( ,'.
 #
 # Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
+sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
+sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
+sp_type_question                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
+sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
+sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force
+sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
-sp_before_class_colon           = ignore   # ignore/add/remove/force
+sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_constr_colon          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before case ':'.
 #
 # Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
+sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_operator_sym           = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_cast                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
 
 # 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_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
+sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
+sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
 
 # 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_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
+sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
-sp_inside_braces_empty          = ignore   # ignore/add/remove/force
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
+sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_func                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
+sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
+sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_tparen                = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
+sp_fparen_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between ')' and '{' of a function call in object
 # initialization.
 #
 # Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # 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_user_paren         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
 
 # 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_paren_paren   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a constructor/destructor and the open
 # parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
+sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
+sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
+sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
+sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
+sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
+sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space before Objective-C protocol list
 # as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'super' and '(' in 'super (something)'.
 #
 # Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'this' and '(' in 'this (something)'.
 #
 # Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
+sp_macro                        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
+sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'else' and '{' if on the same line.
-sp_else_brace                   = ignore   # ignore/add/remove/force
+sp_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'else' if on the same line.
-sp_brace_else                   = ignore   # ignore/add/remove/force
+sp_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'catch' if on the same line.
-sp_brace_catch                  = ignore   # ignore/add/remove/force
+sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
+sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
+sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
+sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a variable and '{' for C++ uniform
 # initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # 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                = add      # ignore/add/remove/force/not_defined
 
 # Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
+sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
+sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '!' (not) unary operator.
 #
 # Default: remove
-sp_not                          = remove   # ignore/add/remove/force
+sp_not                          = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
 
 # 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                         = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
 # Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+sp_member                       = remove   # ignore/add/remove/force/not_defined
 
 # 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                        = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
 #
 # Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
 
 # 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                       = remove   # ignore/add/remove/force/not_defined
 
 # 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               = add      # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
 
 # (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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
+sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var : <here> expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+# as in 'for (Type var <here> : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
+# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 
-# 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
+# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
 
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
+# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+# A region marker is defined as a comment which is not preceded by other text
+# (i.e. the comment is the first non-whitespace on the line), and which starts
+# with either 'BEGIN' or 'END'.
+#
+# Overrides sp_cmt_cpp_start.
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+
+# If true, space 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 '//~'.
+# If true, space 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
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
+sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
+sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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   # ignore/add/remove/force/not_defined
 
 # 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.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
+sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # If true, vbrace tokens are dropped to the previous token and skipped.
 sp_skip_vbrace_tokens           = false    # true/false
 
 # Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
+sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
+sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
@@ -1031,6 +1046,12 @@ indent_extern                   = false    # true/false
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Additional indent before the leading base class colon.
+# Negative values decrease indent down to the first column.
+# Requires a newline break before colon (see pos_class_colon
+# and nl_class_colon)
+indent_before_class_colon       = 0        # number
+
 # Whether to indent the stuff after a leading base class colon.
 indent_class_colon              = false    # true/false
 
@@ -1142,8 +1163,14 @@ indent_sparen_extra             = 0        # number
 indent_relative_single_line_comments = false    # true/false
 
 # Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# It might wise to choose the same value for the option indent_case_brace.
 indent_switch_case              = 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.
+# It might wise to choose the same value for the option indent_switch_case.
+indent_case_brace               = 0        # number
+
 # indent 'break' with 'case' from 'switch'.
 indent_switch_break_with_case   = false    # true/false
 
@@ -1156,10 +1183,6 @@ indent_switch_pp                = true     # true/false
 # 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.
-indent_case_brace               = 0        # number
-
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
@@ -1210,6 +1233,10 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
+# Whether to indent a comma when inside a brace.
+# If true, aligns under the open brace.
+indent_comma_brace              = false    # true/false
+
 # Whether to indent a comma when inside a parenthesis.
 # If true, aligns under the open parenthesis.
 indent_comma_paren              = false    # true/false
@@ -1316,10 +1343,10 @@ indent_token_after_brace        = true     # true/false
 indent_cpp_lambda_body          = false    # true/false
 
 # How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
+# true: add both the indent from return & the compound literal open brace
+#       (i.e. 2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only
+#        add the indent for the return.
 #
 # Default: true
 indent_compound_literal_return  = true     # true/false
@@ -1336,7 +1363,7 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
-# Whether to indent the statments inside ternary operator.
+# Whether to indent the statements inside ternary operator.
 indent_inside_ternary_operator  = false    # true/false
 
 # If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
@@ -1392,6 +1419,9 @@ nl_if_leave_one_liners          = false    # true/false
 # Don't split one-line while statements, as in 'while(...) b++;'.
 nl_while_leave_one_liners       = false    # true/false
 
+# Don't split one-line do statements, as in 'do { b++; } while(...);'.
+nl_do_leave_one_liners          = false    # true/false
+
 # Don't split one-line for statements, as in 'for(...) b++;'.
 nl_for_leave_one_liners         = false    # true/false
 
@@ -1399,166 +1429,166 @@ nl_for_leave_one_liners         = false    # true/false
 nl_oc_msg_leave_one_liner       = false    # true/false
 
 # (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
+nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
 
 # Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
+nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline after '= ['. Will also affect the newline before
 # the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
+nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
+nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
+nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
+nl_struct_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
+nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
+nl_if_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
+nl_brace_else                   = ignore   # ignore/add/remove/force/not_defined
 
 # 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_elseif_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
+nl_else_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
+nl_else_if                      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
+nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
+nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
+nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
+nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
+nl_for_brace                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the '{' of a 'catch' statement, as in
 # 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
+nl_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
+nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
 
 # (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_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
+nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
+nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
+nl_while_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
 
 # (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
+nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
+nl_do_brace                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
+nl_brace_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
+nl_switch_brace                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
+nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline between ')' and '{' if the ')' is on a different line than the
 # if/for/etc.
@@ -1569,11 +1599,11 @@ nl_multi_line_cond              = false    # true/false
 
 # Add a newline after '(' if an if/for/while/switch condition spans multiple
 # lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
 
 # Add a newline before ')' if an if/for/while/switch condition spans multiple
 # lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
 
 # Force a newline in a define after the macro name for multi-line defines.
 nl_multi_line_define            = false    # true/false
@@ -1588,141 +1618,141 @@ nl_after_case                   = false    # true/false
 # 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   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
+nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
+nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
+nl_template_class               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class declaration.
 #
 # Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
+nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class declaration.
 #
 # Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template class definition.
 #
 # Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
+nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized class definition.
 #
 # Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
+nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
+nl_template_func                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # declaration.
 #
 # Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
+nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # declaration.
 #
 # Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template function
 # definition.
 #
 # Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
+nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<>' of a specialized function
 # definition.
 #
 # Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
+nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
+nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'template<...>' and 'using' of a templated
 # type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
+nl_template_using               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
+nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before or after (depending on pos_class_comma,
 # may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
+nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between return type and function name in a function
 # definition.
 # might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
+nl_func_type_name               = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_name_class         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_class_scope             = ignore   # ignore/add/remove/force/not_defined
 
 # 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_scope_name              = ignore   # ignore/add/remove/force/not_defined
 
 # 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_proto_type_name         = ignore   # ignore/add/remove/force/not_defined
 
 # 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                   = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
+nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
 
 # 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               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # 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              = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
+nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
+nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
+nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1733,13 +1763,13 @@ nl_func_decl_start_multi_line   = false    # true/false
 nl_func_def_start_multi_line    = false    # true/false
 
 # Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
+nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
+nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
+nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1750,16 +1780,16 @@ nl_func_decl_args_multi_line    = false    # true/false
 nl_func_def_args_multi_line     = false    # true/false
 
 # Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
+nl_func_decl_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
+nl_func_def_end                 = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
 
 # Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
+nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
 
 # 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.
@@ -1770,20 +1800,20 @@ nl_func_decl_end_multi_line     = false    # true/false
 nl_func_def_end_multi_line      = false    # true/false
 
 # Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
+nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
+nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
+nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call,
 # has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
+nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
+nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
@@ -1797,7 +1827,7 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
-# Whether to respect nl_func_call_XXX option incase of closure args.
+# Whether to respect nl_func_call_XXX option in case of closure args.
 nl_func_call_args_multi_line_ignore_closures = false    # true/false
 
 # Whether to add a newline after '<' of a template parameter list.
@@ -1814,36 +1844,36 @@ nl_template_end                 = false    # true/false
 nl_oc_msg_args                  = false    # true/false
 
 # Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
+nl_fdef_brace                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between function signature and '{',
 # if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
+nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
 # (Java) Add or remove newline between the ')' and '{{' of the double brace
 # initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # 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          = ignore   # ignore/add/remove/force/not_defined
 
 # 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_open     = ignore   # ignore/add/remove/force/not_defined
 
 # 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_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after '{'. This also adds a newline before the
 # matching '}'.
@@ -1872,7 +1902,7 @@ 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.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
+nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to alter newlines in '#define' macros.
 nl_define_macro                 = false    # true/false
@@ -1890,41 +1920,41 @@ nl_squeeze_ifdef                = false    # true/false
 nl_squeeze_ifdef_top_level      = false    # true/false
 
 # Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
 
 # 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_after_if                     = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to put a blank line before 'return' statements, unless after an open
 # brace.
@@ -1935,10 +1965,10 @@ nl_before_return                = false    # true/false
 nl_after_return                 = false    # true/false
 
 # Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
+nl_before_member                = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
+nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to double-space commented-entries in 'struct'/'union'/'enum'.
 nl_ds_struct_enum_cmt           = false    # true/false
@@ -1949,11 +1979,11 @@ nl_ds_struct_enum_close_brace   = false    # true/false
 
 # 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_class_colon                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -1977,9 +2007,8 @@ nl_create_while_one_liner       = false    # true/false
 # a single line.
 nl_create_func_def_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.
+# Whether to split one-line simple unbraced if statements into three lines by
+# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
 nl_create_list_one_liner        = false    # true/false
 
 # Whether to split one-line simple unbraced if statements into two lines by
@@ -2009,13 +2038,16 @@ nl_max                          = 0        # unsigned number
 nl_max_blank_in_func            = 0        # unsigned number
 
 # The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
+# This option overrides eat_blanks_after_open_brace and
+# eat_blanks_before_close_brace, but is ignored when
+# nl_collapse_empty_body=true
 nl_inside_empty_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.
+# The number of newlines before a multi-line function definition. Where
+# applicable, this option is overridden with eat_blanks_after_open_brace=true
 nl_before_func_body_def         = 0        # unsigned number
 
 # The number of newlines before a class constructor/destructor prototype.
@@ -2183,7 +2215,7 @@ nl_around_cs_property           = 0        # unsigned number
 nl_between_get_set              = 0        # unsigned number
 
 # (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
+nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove blank lines after '{'.
 eat_blanks_after_open_brace     = false    # true/false
@@ -2200,10 +2232,10 @@ nl_remove_extra_newlines        = 0        # unsigned number
 
 # (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
+nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
 
 # (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
+nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
 
 # The number of newlines before a whole-file #ifdef.
 #
@@ -2617,9 +2649,44 @@ cmt_width                       = 0        # unsigned number
 #
 # 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
 # 1: No touching at all
-# 2: Full reflow
+# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
 cmt_reflow_mode                 = 0        # unsigned number
 
+# Path to a file that contains regular expressions describing patterns for
+# which the end of one line and the beginning of the next will be folded into
+# the same sentence or paragraph during full comment reflow. The regular
+# expressions are described using ECMAScript syntax. The syntax for this
+# specification is as follows, where "..." indicates the custom regular
+# expression and "n" indicates the nth end_of_prev_line_regex and
+# beg_of_next_line_regex regular expression pair:
+#
+# end_of_prev_line_regex[1] = "...$"
+# beg_of_next_line_regex[1] = "^..."
+# end_of_prev_line_regex[2] = "...$"
+# beg_of_next_line_regex[2] = "^..."
+#             .
+#             .
+#             .
+# end_of_prev_line_regex[n] = "...$"
+# beg_of_next_line_regex[n] = "^..."
+#
+# Note that use of this option overrides the default reflow fold regular
+# expressions, which are internally defined as follows:
+#
+# end_of_prev_line_regex[1] = "[\w,\]\)]$"
+# beg_of_next_line_regex[1] = "^[\w,\[\(]"
+# end_of_prev_line_regex[2] = "\.$"
+# beg_of_next_line_regex[2] = "^[A-Z]"
+cmt_reflow_fold_regex_file      = ""         # string
+
+# Whether to indent wrapped lines to the start of the encompassing paragraph
+# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+# specified by cmt_sp_after_star_cont.
+#
+# Note that cmt_align_doxygen_javadoc_tags overrides this option for
+# paragraphs associated with javadoc tags
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+
 # 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
@@ -2630,6 +2697,22 @@ cmt_convert_tab_to_spaces       = false    # true/false
 # Default: true
 cmt_indent_multi                = true     # true/false
 
+# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+# and corresponding fields such that groups of consecutive block tags,
+# parameter names, and descriptions align with one another. Overrides that
+# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+# in order to achieve the desired alignment for line-wrapping.
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+
+# The number of spaces to insert after the star and before doxygen
+# javadoc-style tags (@param, @return, etc). Requires enabling
+# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+# cmt_sp_after_star_cont.
+#
+# Default: 1
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+
 # Whether to group c-comments that look like they are in a block.
 cmt_c_group                     = false    # true/false
 
@@ -2736,17 +2819,17 @@ cmt_insert_before_ctor_dtor     = false    # true/false
 #
 
 # Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
+mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
+mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
+mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 
 # 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_if               = ignore   # ignore/add/remove/force/not_defined
 
 # 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
@@ -2762,10 +2845,10 @@ mod_full_brace_if_chain         = false    # true/false
 mod_full_brace_if_chain_only    = false    # true/false
 
 # Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
+mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
+mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl               = 0        # unsigned number
@@ -2787,7 +2870,7 @@ mod_full_brace_nl               = 0        # unsigned number
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
 # Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
+mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
@@ -2862,14 +2945,14 @@ mod_move_case_break             = false    # true/false
 
 # 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_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # 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
+mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
 
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
@@ -2904,7 +2987,7 @@ mod_sort_oc_property_nullability_weight = 0        # number
 
 # 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   # ignore/add/remove/force/not_defined
 
 # Whether to indent #if/#else/#endif at the brace level. If false, these are
 # indented from column 1.
@@ -2919,7 +3002,7 @@ pp_indent_at_level              = false    # true/false
 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
+pp_space                        = ignore   # ignore/add/remove/force/not_defined
 
 # Sets the number of spaces per level added with pp_space.
 pp_space_count                  = 0        # unsigned number
@@ -3042,9 +3125,8 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
+# If true: the form feed character is removed from the list of whitespace
+# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
 use_form_feed_no_more_as_whitespace_character = false    # true/false
 
 #
@@ -3072,6 +3154,10 @@ debug_line_number_to_protocol   = 0        # number
 # only for linux
 debug_timeout                   = 0        # number
 
+# Set the number of characters to be printed if the text is too long,
+# 0: do not truncate.
+debug_truncate                  = 0        # unsigned number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/tracking_space.html
new file mode 100644
index 00000000..d3b69435
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/tracking_space.html
@@ -0,0 +1,23 @@
+<html>
+<head>
+   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+   <title>Uncrustify: where do the Spaces options work</title>
+</head>
+<body lang="en-US">
+<p>
+</p>
+<pre>
+{
+   a = b + 111 - 55;
+}
+template<typename ... A, int... B>
+struct foo1 : foo1<A..., (sizeof...(A) + B)...>
+{
+   foo1() {
+      int x = sizeof...(A);
+      bool b = x > 1;
+   }
+};
+</pre>
+</body>
+</html>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/truncate.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/truncate.txt
new file mode 100644
index 00000000..8c428d84
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/truncate.txt
@@ -0,0 +1,16 @@
+output_text : text() is '// 1 6789A123456789B123456789c12345678 ... <The string is truncated>', type is COMMENT_CPP, orig_line is 1, column is 1, nl is 0
+output_cmt_start : no cmt_insert_file
+output_comment_cpp : set cont_text to '// '
+output_text : text() is '', type is NEWLINE, orig_line is 1, column is 74, nl is 1
+output_text : text() is '// 2 678 ... <The string is truncated>', type is COMMENT_CPP, orig_line is 2, column is 1, nl is 0
+output_cmt_start : no cmt_insert_file
+output_comment_cpp : set cont_text to '// '
+output_text : text() is '', type is NEWLINE, orig_line is 2, column is 40, nl is 1
+output_text : text() is '// 3 6789A123456789B123456789c12345678', type is COMMENT_CPP, orig_line is 3, column is 1, nl is 0
+output_cmt_start : no cmt_insert_file
+output_comment_cpp : set cont_text to '// '
+output_text : text() is '', type is NEWLINE, orig_line is 3, column is 39, nl is 1
+output_text : text() is '// 4 6789A123456789B123456789c1234567', type is COMMENT_CPP, orig_line is 4, column is 1, nl is 0
+output_cmt_start : no cmt_insert_file
+output_comment_cpp : set cont_text to '// '
+output_text : text() is '', type is NEWLINE, orig_line is 4, column is 38, nl is 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/universalindent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/universalindent.cfg
index 1c031976..48a9dd47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/universalindent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/universalindent.cfg
@@ -84,7 +84,7 @@ ValueDefault=false
 
 [Disable Processing Nl Cont]
 Category=0
-Description="<html>Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)</html>"
+Description="<html>Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=disable_processing_nl_cont=true|disable_processing_nl_cont=false
@@ -92,7 +92,7 @@ ValueDefault=false
 
 [Disable Processing Cmt]
 Category=0
-Description="<html>Specify the marker used in comments to disable processing of part of the<br/>file.<br/>The comment should be used alone in one line.<br/><br/>Default:  *INDENT-OFF*</html>"
+Description="<html>Specify the marker used in comments to disable processing of part of the<br/>file.<br/><br/>Default:  *INDENT-OFF*</html>"
 Enabled=false
 CallName=disable_processing_cmt=
 EditorType=string
@@ -100,7 +100,7 @@ ValueDefault= *INDENT-OFF*
 
 [Enable Processing Cmt]
 Category=0
-Description="<html>Specify the marker used in comments to (re)enable processing in a file.<br/>The comment should be used alone in one line.<br/><br/>Default:  *INDENT-ON*</html>"
+Description="<html>Specify the marker used in comments to (re)enable processing in a file.<br/><br/>Default:  *INDENT-ON*</html>"
 Enabled=false
 CallName=enable_processing_cmt=
 EditorType=string
@@ -114,12 +114,20 @@ EditorType=boolean
 TrueFalse=enable_digraphs=true|enable_digraphs=false
 ValueDefault=false
 
+[Processing Cmt As Regex]
+Category=0
+Description="<html>Option to allow both disable_processing_cmt and enable_processing_cmt<br/>strings, if specified, to be interpreted as ECMAScript regular expressions.<br/>If true, a regex search will be performed within comments according to the<br/>specified patterns in order to disable/enable processing.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=processing_cmt_as_regex=true|processing_cmt_as_regex=false
+ValueDefault=false
+
 [Utf8 Bom]
 Category=0
 Description="<html>Add or remove 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|utf8_bom=not_defined
 ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
 ValueDefault=ignore
 
@@ -139,39 +147,12 @@ EditorType=boolean
 TrueFalse=utf8_force=true|utf8_force=false
 ValueDefault=false
 
-[Sp Do Brace Open]
-Category=0
-Description="<html>Add or remove space between 'do' and '{'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_do_brace_open=ignore|sp_do_brace_open=add|sp_do_brace_open=remove|sp_do_brace_open=force
-ChoicesReadable="Ignore Sp Do Brace Open|Add Sp Do Brace Open|Remove Sp Do Brace Open|Force Sp Do Brace Open"
-ValueDefault=ignore
-
-[Sp Brace Close While]
-Category=0
-Description="<html>Add or remove space between '}' and 'while'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_brace_close_while=ignore|sp_brace_close_while=add|sp_brace_close_while=remove|sp_brace_close_while=force
-ChoicesReadable="Ignore Sp Brace Close While|Add Sp Brace Close While|Remove Sp Brace Close While|Force Sp Brace Close While"
-ValueDefault=ignore
-
-[Sp While Paren Open]
-Category=0
-Description="<html>Add or remove space between 'while' and '('.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_while_paren_open=ignore|sp_while_paren_open=add|sp_while_paren_open=remove|sp_while_paren_open=force
-ChoicesReadable="Ignore Sp While Paren Open|Add Sp While Paren Open|Remove Sp While Paren Open|Force Sp While Paren Open"
-ValueDefault=ignore
-
 [Sp Arith]
 Category=1
 Description="<html>Add or remove space around non-assignment symbolic operators ('+', '/', '%',<br/>'&lt;&lt;', and so forth).</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|sp_arith=not_defined
 ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith"
 ValueDefault=ignore
 
@@ -180,7 +161,7 @@ Category=1
 Description="<html>Add or remove space around arithmetic operators '+' and '-'.<br/><br/>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|sp_arith_additive=not_defined
 ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive"
 ValueDefault=ignore
 
@@ -189,7 +170,7 @@ 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|sp_assign=not_defined
 ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
 ValueDefault=ignore
 
@@ -198,7 +179,7 @@ Category=1
 Description="<html>Add or remove space around '=' in C++11 lambda capture specifications.<br/><br/>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|sp_cpp_lambda_assign=not_defined
 ChoicesReadable="Ignore Sp Cpp Lambda Assign|Add Sp Cpp Lambda Assign|Remove Sp Cpp Lambda Assign|Force Sp Cpp Lambda Assign"
 ValueDefault=ignore
 
@@ -207,7 +188,7 @@ Category=1
 Description="<html>Add or remove space after the capture specification of a C++11 lambda when<br/>an argument list is present, as in '[] &lt;here&gt; (int x){ ... }'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_lambda_square_paren=ignore|sp_cpp_lambda_square_paren=add|sp_cpp_lambda_square_paren=remove|sp_cpp_lambda_square_paren=force
+Choices=sp_cpp_lambda_square_paren=ignore|sp_cpp_lambda_square_paren=add|sp_cpp_lambda_square_paren=remove|sp_cpp_lambda_square_paren=force|sp_cpp_lambda_square_paren=not_defined
 ChoicesReadable="Ignore Sp Cpp Lambda Square Paren|Add Sp Cpp Lambda Square Paren|Remove Sp Cpp Lambda Square Paren|Force Sp Cpp Lambda Square Paren"
 ValueDefault=ignore
 
@@ -216,16 +197,25 @@ Category=1
 Description="<html>Add or remove space after the capture specification of a C++11 lambda with<br/>no argument list is present, as in '[] &lt;here&gt; { ... }'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_lambda_square_brace=ignore|sp_cpp_lambda_square_brace=add|sp_cpp_lambda_square_brace=remove|sp_cpp_lambda_square_brace=force
+Choices=sp_cpp_lambda_square_brace=ignore|sp_cpp_lambda_square_brace=add|sp_cpp_lambda_square_brace=remove|sp_cpp_lambda_square_brace=force|sp_cpp_lambda_square_brace=not_defined
 ChoicesReadable="Ignore Sp Cpp Lambda Square Brace|Add Sp Cpp Lambda Square Brace|Remove Sp Cpp Lambda Square Brace|Force Sp Cpp Lambda Square Brace"
 ValueDefault=ignore
 
+[Sp Cpp Lambda Argument List]
+Category=1
+Description="<html>Add or remove space after the opening parenthesis and before the closing<br/>parenthesis of a argument list of a C++11 lambda, as in<br/>'[]( &lt;here&gt; int x &lt;here&gt; ){ ... }'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_argument_list=ignore|sp_cpp_lambda_argument_list=add|sp_cpp_lambda_argument_list=remove|sp_cpp_lambda_argument_list=force|sp_cpp_lambda_argument_list=not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Argument List|Add Sp Cpp Lambda Argument List|Remove Sp Cpp Lambda Argument List|Force Sp Cpp Lambda Argument List"
+ValueDefault=ignore
+
 [Sp Cpp Lambda Paren Brace]
 Category=1
 Description="<html>Add or remove space after the argument list of a C++11 lambda, as in<br/>'[](int x) &lt;here&gt; { ... }'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_lambda_paren_brace=ignore|sp_cpp_lambda_paren_brace=add|sp_cpp_lambda_paren_brace=remove|sp_cpp_lambda_paren_brace=force
+Choices=sp_cpp_lambda_paren_brace=ignore|sp_cpp_lambda_paren_brace=add|sp_cpp_lambda_paren_brace=remove|sp_cpp_lambda_paren_brace=force|sp_cpp_lambda_paren_brace=not_defined
 ChoicesReadable="Ignore Sp Cpp Lambda Paren Brace|Add Sp Cpp Lambda Paren Brace|Remove Sp Cpp Lambda Paren Brace|Force Sp Cpp Lambda Paren Brace"
 ValueDefault=ignore
 
@@ -234,7 +224,7 @@ Category=1
 Description="<html>Add or remove space between a lambda body and its call operator of an<br/>immediately invoked lambda, as in '[]( ... ){ ... } &lt;here&gt; ( ... )'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_cpp_lambda_fparen=ignore|sp_cpp_lambda_fparen=add|sp_cpp_lambda_fparen=remove|sp_cpp_lambda_fparen=force
+Choices=sp_cpp_lambda_fparen=ignore|sp_cpp_lambda_fparen=add|sp_cpp_lambda_fparen=remove|sp_cpp_lambda_fparen=force|sp_cpp_lambda_fparen=not_defined
 ChoicesReadable="Ignore Sp Cpp Lambda Fparen|Add Sp Cpp Lambda Fparen|Remove Sp Cpp Lambda Fparen|Force Sp Cpp Lambda Fparen"
 ValueDefault=ignore
 
@@ -243,7 +233,7 @@ Category=1
 Description="<html>Add or remove space around assignment operator '=' in a prototype.<br/><br/>If set to ignore, use sp_assign.</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|sp_assign_default=not_defined
 ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
 ValueDefault=ignore
 
@@ -252,7 +242,7 @@ Category=1
 Description="<html>Add or remove space before assignment operator '=', '+=', etc.<br/><br/>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|sp_before_assign=not_defined
 ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign"
 ValueDefault=ignore
 
@@ -261,7 +251,7 @@ Category=1
 Description="<html>Add or remove space after assignment operator '=', '+=', etc.<br/><br/>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|sp_after_assign=not_defined
 ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
 ValueDefault=ignore
 
@@ -270,7 +260,7 @@ 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|sp_enum_paren=not_defined
 ChoicesReadable="Ignore Sp Enum Paren|Add Sp Enum Paren|Remove Sp Enum Paren|Force Sp Enum Paren"
 ValueDefault=ignore
 
@@ -279,7 +269,7 @@ 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|sp_enum_assign=not_defined
 ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign"
 ValueDefault=ignore
 
@@ -288,7 +278,7 @@ Category=1
 Description="<html>Add or remove space before assignment '=' in enum.<br/><br/>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|sp_enum_before_assign=not_defined
 ChoicesReadable="Ignore Sp Enum Before Assign|Add Sp Enum Before Assign|Remove Sp Enum Before Assign|Force Sp Enum Before Assign"
 ValueDefault=ignore
 
@@ -297,7 +287,7 @@ Category=1
 Description="<html>Add or remove space after assignment '=' in enum.<br/><br/>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|sp_enum_after_assign=not_defined
 ChoicesReadable="Ignore Sp Enum After Assign|Add Sp Enum After Assign|Remove Sp Enum After Assign|Force Sp Enum After Assign"
 ValueDefault=ignore
 
@@ -306,7 +296,7 @@ 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|sp_enum_colon=not_defined
 ChoicesReadable="Ignore Sp Enum Colon|Add Sp Enum Colon|Remove Sp Enum Colon|Force Sp Enum Colon"
 ValueDefault=ignore
 
@@ -315,7 +305,7 @@ Category=1
 Description="<html>Add or remove space around preprocessor '##' concatenation operator.<br/><br/>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|sp_pp_concat=not_defined
 ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat"
 ValueDefault=add
 
@@ -324,7 +314,7 @@ Category=1
 Description="<html>Add or remove space after preprocessor '#' stringify operator.<br/>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|sp_pp_stringify=not_defined
 ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify"
 ValueDefault=ignore
 
@@ -333,7 +323,7 @@ Category=1
 Description="<html>Add or remove space before preprocessor '#' stringify operator<br/>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|sp_before_pp_stringify=not_defined
 ChoicesReadable="Ignore Sp Before Pp Stringify|Add Sp Before Pp Stringify|Remove Sp Before Pp Stringify|Force Sp Before Pp Stringify"
 ValueDefault=ignore
 
@@ -342,7 +332,7 @@ 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|sp_bool=not_defined
 ChoicesReadable="Ignore Sp Bool|Add Sp Bool|Remove Sp Bool|Force Sp Bool"
 ValueDefault=ignore
 
@@ -351,7 +341,7 @@ 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|sp_compare=not_defined
 ChoicesReadable="Ignore Sp Compare|Add Sp Compare|Remove Sp Compare|Force Sp Compare"
 ValueDefault=ignore
 
@@ -360,7 +350,7 @@ 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|sp_inside_paren=not_defined
 ChoicesReadable="Ignore Sp Inside Paren|Add Sp Inside Paren|Remove Sp Inside Paren|Force Sp Inside Paren"
 ValueDefault=ignore
 
@@ -369,7 +359,7 @@ Category=1
 Description="<html>Add or remove space between nested parentheses, i.e. '((' 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|sp_paren_paren=not_defined
 ChoicesReadable="Ignore Sp Paren Paren|Add Sp Paren Paren|Remove Sp Paren Paren|Force Sp Paren Paren"
 ValueDefault=ignore
 
@@ -378,7 +368,7 @@ Category=1
 Description="<html>Add or remove space between back-to-back parentheses, i.e. ')(' 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|sp_cparen_oparen=not_defined
 ChoicesReadable="Ignore Sp Cparen Oparen|Add Sp Cparen Oparen|Remove Sp Cparen Oparen|Force Sp Cparen Oparen"
 ValueDefault=ignore
 
@@ -395,16 +385,16 @@ 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|sp_paren_brace=not_defined
 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>"
+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
+Choices=sp_brace_brace=ignore|sp_brace_brace=add|sp_brace_brace=remove|sp_brace_brace=force|sp_brace_brace=not_defined
 ChoicesReadable="Ignore Sp Brace Brace|Add Sp Brace Brace|Remove Sp Brace Brace|Force Sp Brace Brace"
 ValueDefault=ignore
 
@@ -413,7 +403,7 @@ 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|sp_before_ptr_star=not_defined
 ChoicesReadable="Ignore Sp Before Ptr Star|Add Sp Before Ptr Star|Remove Sp Before Ptr Star|Force Sp Before Ptr Star"
 ValueDefault=ignore
 
@@ -422,7 +412,7 @@ 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>"
 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|sp_before_unnamed_ptr_star=not_defined
 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
 
@@ -431,7 +421,7 @@ 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|sp_between_ptr_star=not_defined
 ChoicesReadable="Ignore Sp Between Ptr Star|Add Sp Between Ptr Star|Remove Sp Between Ptr Star|Force Sp Between Ptr Star"
 ValueDefault=ignore
 
@@ -440,7 +430,7 @@ Category=1
 Description="<html>Add or remove space after pointer star '*', if followed by a word.<br/><br/>Overrides sp_type_func.</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|sp_after_ptr_star=not_defined
 ChoicesReadable="Ignore Sp After Ptr Star|Add Sp After Ptr Star|Remove Sp After Ptr Star|Force Sp After Ptr Star"
 ValueDefault=ignore
 
@@ -449,7 +439,7 @@ 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|sp_after_ptr_block_caret=not_defined
 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
 
@@ -458,7 +448,7 @@ 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|sp_after_ptr_star_qualifier=not_defined
 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
 
@@ -467,7 +457,7 @@ Category=1
 Description="<html>Add or remove space after a pointer star '*', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_ptr_star and sp_type_func.</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|sp_after_ptr_star_func=not_defined
 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
 
@@ -476,7 +466,7 @@ Category=1
 Description="<html>Add or remove space after a pointer star '*', if followed by an open<br/>parenthesis, as in 'void* (*)().</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|sp_ptr_star_paren=not_defined
 ChoicesReadable="Ignore Sp Ptr Star Paren|Add Sp Ptr Star Paren|Remove Sp Ptr Star Paren|Force Sp Ptr Star Paren"
 ValueDefault=ignore
 
@@ -485,7 +475,7 @@ Category=1
 Description="<html>Add or remove space before a pointer star '*', if followed by a function<br/>prototype or function definition.</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|sp_before_ptr_star_func=not_defined
 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
 
@@ -494,7 +484,7 @@ 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|sp_before_byref=not_defined
 ChoicesReadable="Ignore Sp Before Byref|Add Sp Before Byref|Remove Sp Before Byref|Force Sp Before Byref"
 ValueDefault=ignore
 
@@ -503,7 +493,7 @@ 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>"
 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|sp_before_unnamed_byref=not_defined
 ChoicesReadable="Ignore Sp Before Unnamed Byref|Add Sp Before Unnamed Byref|Remove Sp Before Unnamed Byref|Force Sp Before Unnamed Byref"
 ValueDefault=ignore
 
@@ -512,7 +502,7 @@ Category=1
 Description="<html>Add or remove space after reference sign '&amp;', if followed by a word.<br/><br/>Overrides sp_type_func.</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|sp_after_byref=not_defined
 ChoicesReadable="Ignore Sp After Byref|Add Sp After Byref|Remove Sp After Byref|Force Sp After Byref"
 ValueDefault=ignore
 
@@ -521,7 +511,7 @@ Category=1
 Description="<html>Add or remove space after a reference sign '&amp;', if followed by a function<br/>prototype or function definition.<br/><br/>Overrides sp_after_byref and sp_type_func.</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|sp_after_byref_func=not_defined
 ChoicesReadable="Ignore Sp After Byref Func|Add Sp After Byref Func|Remove Sp After Byref Func|Force Sp After Byref Func"
 ValueDefault=ignore
 
@@ -530,7 +520,7 @@ Category=1
 Description="<html>Add or remove space before a reference sign '&amp;', if followed by a function<br/>prototype or function definition.</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|sp_before_byref_func=not_defined
 ChoicesReadable="Ignore Sp Before Byref Func|Add Sp Before Byref Func|Remove Sp Before Byref Func|Force Sp Before Byref Func"
 ValueDefault=ignore
 
@@ -539,16 +529,16 @@ Category=1
 Description="<html>Add or remove space between type and word. In cases where total removal of<br/>whitespace would be a syntax error, a value of 'remove' is treated the same<br/>as 'force'.<br/><br/>This also affects some other instances of space following a type that are<br/>not covered by other options; for example, between the return type and<br/>parenthesis of a function type template argument, between the type and<br/>parenthesis of an array parameter, or between 'decltype(...)' and the<br/>following word.<br/><br/>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|sp_after_type=not_defined
 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.<br/><br/>Overrides sp_after_type.</html>"
+Description="<html>Add or remove space between 'decltype(...)' and word,<br/>brace or function call.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_decltype=ignore|sp_after_decltype=add|sp_after_decltype=remove|sp_after_decltype=force
+Choices=sp_after_decltype=ignore|sp_after_decltype=add|sp_after_decltype=remove|sp_after_decltype=force|sp_after_decltype=not_defined
 ChoicesReadable="Ignore Sp After Decltype|Add Sp After Decltype|Remove Sp After Decltype|Force Sp After Decltype"
 ValueDefault=ignore
 
@@ -557,7 +547,7 @@ Category=1
 Description="<html>(D) Add or remove space before the parenthesis in the D constructs<br/>'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|sp_before_template_paren=not_defined
 ChoicesReadable="Ignore Sp Before Template Paren|Add Sp Before Template Paren|Remove Sp Before Template Paren|Force Sp Before Template Paren"
 ValueDefault=ignore
 
@@ -566,7 +556,7 @@ Category=1
 Description="<html>Add or remove space between 'template' and '&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|sp_template_angle=not_defined
 ChoicesReadable="Ignore Sp Template Angle|Add Sp Template Angle|Remove Sp Template Angle|Force Sp Template Angle"
 ValueDefault=ignore
 
@@ -575,7 +565,7 @@ Category=1
 Description="<html>Add or remove space before '&lt;'.</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|sp_before_angle=not_defined
 ChoicesReadable="Ignore Sp Before Angle|Add Sp Before Angle|Remove Sp Before Angle|Force Sp Before Angle"
 ValueDefault=ignore
 
@@ -584,7 +574,7 @@ 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|sp_inside_angle=not_defined
 ChoicesReadable="Ignore Sp Inside Angle|Add Sp Inside Angle|Remove Sp Inside Angle|Force Sp Inside Angle"
 ValueDefault=ignore
 
@@ -593,7 +583,7 @@ Category=1
 Description="<html>Add or remove space inside '&lt;&gt;'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_angle_empty=ignore|sp_inside_angle_empty=add|sp_inside_angle_empty=remove|sp_inside_angle_empty=force
+Choices=sp_inside_angle_empty=ignore|sp_inside_angle_empty=add|sp_inside_angle_empty=remove|sp_inside_angle_empty=force|sp_inside_angle_empty=not_defined
 ChoicesReadable="Ignore Sp Inside Angle Empty|Add Sp Inside Angle Empty|Remove Sp Inside Angle Empty|Force Sp Inside Angle Empty"
 ValueDefault=ignore
 
@@ -602,7 +592,7 @@ Category=1
 Description="<html>Add or remove space between '&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|sp_angle_colon=not_defined
 ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon"
 ValueDefault=ignore
 
@@ -611,7 +601,7 @@ Category=1
 Description="<html>Add or remove space after '&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|sp_after_angle=not_defined
 ChoicesReadable="Ignore Sp After Angle|Add Sp After Angle|Remove Sp After Angle|Force Sp After Angle"
 ValueDefault=ignore
 
@@ -620,7 +610,7 @@ Category=1
 Description="<html>Add or remove space between '&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|sp_angle_paren=not_defined
 ChoicesReadable="Ignore Sp Angle Paren|Add Sp Angle Paren|Remove Sp Angle Paren|Force Sp Angle Paren"
 ValueDefault=ignore
 
@@ -629,7 +619,7 @@ Category=1
 Description="<html>Add or remove space between '&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|sp_angle_paren_empty=not_defined
 ChoicesReadable="Ignore Sp Angle Paren Empty|Add Sp Angle Paren Empty|Remove Sp Angle Paren Empty|Force Sp Angle Paren Empty"
 ValueDefault=ignore
 
@@ -638,7 +628,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force
+Choices=sp_angle_word=ignore|sp_angle_word=add|sp_angle_word=remove|sp_angle_word=force|sp_angle_word=not_defined
 ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word"
 ValueDefault=ignore
 
@@ -647,7 +637,7 @@ Category=1
 Description="<html>Add or remove space between '&gt;' and '&gt;' in '&gt;&gt;' (template stuff).<br/><br/>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|sp_angle_shift=not_defined
 ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift"
 ValueDefault=add
 
@@ -664,7 +654,7 @@ Category=1
 Description="<html>Add or remove space before '(' of control statements ('if', 'for', 'switch',<br/>'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|sp_before_sparen=not_defined
 ChoicesReadable="Ignore Sp Before Sparen|Add Sp Before Sparen|Remove Sp Before Sparen|Force Sp Before Sparen"
 ValueDefault=ignore
 
@@ -673,7 +663,7 @@ Category=1
 Description="<html>Add or remove space inside '(' and ')' of control statements.</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|sp_inside_sparen=not_defined
 ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen"
 ValueDefault=ignore
 
@@ -682,7 +672,7 @@ Category=1
 Description="<html>Add or remove space after '(' of control statements.<br/><br/>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
+Choices=sp_inside_sparen_open=ignore|sp_inside_sparen_open=add|sp_inside_sparen_open=remove|sp_inside_sparen_open=force|sp_inside_sparen_open=not_defined
 ChoicesReadable="Ignore Sp Inside Sparen Open|Add Sp Inside Sparen Open|Remove Sp Inside Sparen Open|Force Sp Inside Sparen Open"
 ValueDefault=ignore
 
@@ -691,7 +681,7 @@ Category=1
 Description="<html>Add or remove space before ')' of control statements.<br/><br/>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
+Choices=sp_inside_sparen_close=ignore|sp_inside_sparen_close=add|sp_inside_sparen_close=remove|sp_inside_sparen_close=force|sp_inside_sparen_close=not_defined
 ChoicesReadable="Ignore Sp Inside Sparen Close|Add Sp Inside Sparen Close|Remove Sp Inside Sparen Close|Force Sp Inside Sparen Close"
 ValueDefault=ignore
 
@@ -700,7 +690,7 @@ Category=1
 Description="<html>Add or remove space after ')' of control statements.</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|sp_after_sparen=not_defined
 ChoicesReadable="Ignore Sp After Sparen|Add Sp After Sparen|Remove Sp After Sparen|Force Sp After Sparen"
 ValueDefault=ignore
 
@@ -709,16 +699,43 @@ Category=1
 Description="<html>Add or remove space between ')' and '{' of of control statements.</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|sp_sparen_brace=not_defined
 ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace"
 ValueDefault=ignore
 
+[Sp Do Brace Open]
+Category=1
+Description="<html>Add or remove space between 'do' and '{'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_do_brace_open=ignore|sp_do_brace_open=add|sp_do_brace_open=remove|sp_do_brace_open=force|sp_do_brace_open=not_defined
+ChoicesReadable="Ignore Sp Do Brace Open|Add Sp Do Brace Open|Remove Sp Do Brace Open|Force Sp Do Brace Open"
+ValueDefault=ignore
+
+[Sp Brace Close While]
+Category=1
+Description="<html>Add or remove space between '}' and 'while'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_brace_close_while=ignore|sp_brace_close_while=add|sp_brace_close_while=remove|sp_brace_close_while=force|sp_brace_close_while=not_defined
+ChoicesReadable="Ignore Sp Brace Close While|Add Sp Brace Close While|Remove Sp Brace Close While|Force Sp Brace Close While"
+ValueDefault=ignore
+
+[Sp While Paren Open]
+Category=1
+Description="<html>Add or remove space between 'while' and '('. Overrides sp_before_sparen.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_while_paren_open=ignore|sp_while_paren_open=add|sp_while_paren_open=remove|sp_while_paren_open=force|sp_while_paren_open=not_defined
+ChoicesReadable="Ignore Sp While Paren Open|Add Sp While Paren Open|Remove Sp While Paren Open|Force Sp While Paren Open"
+ValueDefault=ignore
+
 [Sp Invariant Paren]
 Category=1
 Description="<html>(D) Add or remove space between 'invariant' and '('.</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|sp_invariant_paren=not_defined
 ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren"
 ValueDefault=ignore
 
@@ -727,7 +744,7 @@ Category=1
 Description="<html>(D) Add or remove space after the ')' in 'invariant (C) c'.</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|sp_after_invariant_paren=not_defined
 ChoicesReadable="Ignore Sp After Invariant Paren|Add Sp After Invariant Paren|Remove Sp After Invariant Paren|Force Sp After Invariant Paren"
 ValueDefault=ignore
 
@@ -736,7 +753,7 @@ 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|sp_special_semi=not_defined
 ChoicesReadable="Ignore Sp Special Semi|Add Sp Special Semi|Remove Sp Special Semi|Force Sp Special Semi"
 ValueDefault=ignore
 
@@ -745,7 +762,7 @@ Category=1
 Description="<html>Add or remove space before ';'.<br/><br/>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|sp_before_semi=not_defined
 ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
 ValueDefault=remove
 
@@ -754,7 +771,7 @@ 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|sp_before_semi_for=not_defined
 ChoicesReadable="Ignore Sp Before Semi For|Add Sp Before Semi For|Remove Sp Before Semi For|Force Sp Before Semi For"
 ValueDefault=ignore
 
@@ -763,7 +780,7 @@ 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|sp_before_semi_for_empty=not_defined
 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
 
@@ -772,7 +789,7 @@ Category=1
 Description="<html>Add or remove space after ';', except when followed by a comment.<br/><br/>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|sp_after_semi=not_defined
 ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
 ValueDefault=add
 
@@ -781,7 +798,7 @@ Category=1
 Description="<html>Add or remove space after ';' in non-empty 'for' statements.<br/><br/>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|sp_after_semi_for=not_defined
 ChoicesReadable="Ignore Sp After Semi For|Add Sp After Semi For|Remove Sp After Semi For|Force Sp After Semi For"
 ValueDefault=force
 
@@ -790,7 +807,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_semi_for_empty=ignore|sp_after_semi_for_empty=add|sp_after_semi_for_empty=remove|sp_after_semi_for_empty=force
+Choices=sp_after_semi_for_empty=ignore|sp_after_semi_for_empty=add|sp_after_semi_for_empty=remove|sp_after_semi_for_empty=force|sp_after_semi_for_empty=not_defined
 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
 
@@ -799,7 +816,7 @@ 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|sp_before_square=not_defined
 ChoicesReadable="Ignore Sp Before Square|Add Sp Before Square|Remove Sp Before Square|Force Sp Before Square"
 ValueDefault=ignore
 
@@ -808,7 +825,7 @@ Category=1
 Description="<html>Add or remove space before '[' for a variable definition.<br/><br/>Default: remove</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_vardef_square=ignore|sp_before_vardef_square=add|sp_before_vardef_square=remove|sp_before_vardef_square=force
+Choices=sp_before_vardef_square=ignore|sp_before_vardef_square=add|sp_before_vardef_square=remove|sp_before_vardef_square=force|sp_before_vardef_square=not_defined
 ChoicesReadable="Ignore Sp Before Vardef Square|Add Sp Before Vardef Square|Remove Sp Before Vardef Square|Force Sp Before Vardef Square"
 ValueDefault=remove
 
@@ -817,7 +834,7 @@ Category=1
 Description="<html>Add or remove space before '[' for asm block.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_square_asm_block=ignore|sp_before_square_asm_block=add|sp_before_square_asm_block=remove|sp_before_square_asm_block=force
+Choices=sp_before_square_asm_block=ignore|sp_before_square_asm_block=add|sp_before_square_asm_block=remove|sp_before_square_asm_block=force|sp_before_square_asm_block=not_defined
 ChoicesReadable="Ignore Sp Before Square Asm Block|Add Sp Before Square Asm Block|Remove Sp Before Square Asm Block|Force Sp Before Square Asm Block"
 ValueDefault=ignore
 
@@ -826,7 +843,7 @@ 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|sp_before_squares=not_defined
 ChoicesReadable="Ignore Sp Before Squares|Add Sp Before Squares|Remove Sp Before Squares|Force Sp Before Squares"
 ValueDefault=ignore
 
@@ -835,7 +852,7 @@ Category=1
 Description="<html>Add or remove space before C++17 structured bindings.</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|sp_cpp_before_struct_binding=not_defined
 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
 
@@ -844,7 +861,7 @@ 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|sp_inside_square=not_defined
 ChoicesReadable="Ignore Sp Inside Square|Add Sp Inside Square|Remove Sp Inside Square|Force Sp Inside Square"
 ValueDefault=ignore
 
@@ -853,7 +870,7 @@ Category=1
 Description="<html>Add or remove space inside '[]'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_square_empty=ignore|sp_inside_square_empty=add|sp_inside_square_empty=remove|sp_inside_square_empty=force
+Choices=sp_inside_square_empty=ignore|sp_inside_square_empty=add|sp_inside_square_empty=remove|sp_inside_square_empty=force|sp_inside_square_empty=not_defined
 ChoicesReadable="Ignore Sp Inside Square Empty|Add Sp Inside Square Empty|Remove Sp Inside Square Empty|Force Sp Inside Square Empty"
 ValueDefault=ignore
 
@@ -862,7 +879,7 @@ 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>"
 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|sp_inside_square_oc_array=not_defined
 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
 
@@ -871,7 +888,7 @@ Category=1
 Description="<html>Add or remove space after ',', i.e. '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|sp_after_comma=not_defined
 ChoicesReadable="Ignore Sp After Comma|Add Sp After Comma|Remove Sp After Comma|Force Sp After Comma"
 ValueDefault=ignore
 
@@ -880,7 +897,7 @@ Category=1
 Description="<html>Add or remove space before ','.<br/><br/>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|sp_before_comma=not_defined
 ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
 ValueDefault=remove
 
@@ -889,7 +906,7 @@ Category=1
 Description="<html>(C#) Add or remove space between ',' and ']' in multidimensional array type<br/>like 'int[,,]'.</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|sp_after_mdatype_commas=not_defined
 ChoicesReadable="Ignore Sp After Mdatype Commas|Add Sp After Mdatype Commas|Remove Sp After Mdatype Commas|Force Sp After Mdatype Commas"
 ValueDefault=ignore
 
@@ -898,7 +915,7 @@ Category=1
 Description="<html>(C#) Add or remove space between '[' and ',' in multidimensional array type<br/>like 'int[,,]'.</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|sp_before_mdatype_commas=not_defined
 ChoicesReadable="Ignore Sp Before Mdatype Commas|Add Sp Before Mdatype Commas|Remove Sp Before Mdatype Commas|Force Sp Before Mdatype Commas"
 ValueDefault=ignore
 
@@ -907,7 +924,7 @@ Category=1
 Description="<html>(C#) Add or remove space between ',' in multidimensional array type<br/>like 'int[,,]'.</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|sp_between_mdatype_commas=not_defined
 ChoicesReadable="Ignore Sp Between Mdatype Commas|Add Sp Between Mdatype Commas|Remove Sp Between Mdatype Commas|Force Sp Between Mdatype Commas"
 ValueDefault=ignore
 
@@ -916,7 +933,7 @@ Category=1
 Description="<html>Add or remove space between an open parenthesis and comma,<br/>i.e. '(,' vs. '( ,'.<br/><br/>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|sp_paren_comma=not_defined
 ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
 ValueDefault=force
 
@@ -925,7 +942,7 @@ Category=1
 Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>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|sp_before_ellipsis=not_defined
 ChoicesReadable="Ignore Sp Before Ellipsis|Add Sp Before Ellipsis|Remove Sp Before Ellipsis|Force Sp Before Ellipsis"
 ValueDefault=ignore
 
@@ -934,7 +951,7 @@ 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
+Choices=sp_type_ellipsis=ignore|sp_type_ellipsis=add|sp_type_ellipsis=remove|sp_type_ellipsis=force|sp_type_ellipsis=not_defined
 ChoicesReadable="Ignore Sp Type Ellipsis|Add Sp Type Ellipsis|Remove Sp Type Ellipsis|Force Sp Type Ellipsis"
 ValueDefault=ignore
 
@@ -943,7 +960,7 @@ Category=1
 Description="<html>(D) Add or remove space between a type and '?'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force
+Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force|sp_type_question=not_defined
 ChoicesReadable="Ignore Sp Type Question|Add Sp Type Question|Remove Sp Type Question|Force Sp Type Question"
 ValueDefault=ignore
 
@@ -952,7 +969,7 @@ 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
+Choices=sp_paren_ellipsis=ignore|sp_paren_ellipsis=add|sp_paren_ellipsis=remove|sp_paren_ellipsis=force|sp_paren_ellipsis=not_defined
 ChoicesReadable="Ignore Sp Paren Ellipsis|Add Sp Paren Ellipsis|Remove Sp Paren Ellipsis|Force Sp Paren Ellipsis"
 ValueDefault=ignore
 
@@ -961,7 +978,7 @@ Category=1
 Description="<html>Add or remove space between ')' and a qualifier such as 'const'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_paren_qualifier=ignore|sp_paren_qualifier=add|sp_paren_qualifier=remove|sp_paren_qualifier=force
+Choices=sp_paren_qualifier=ignore|sp_paren_qualifier=add|sp_paren_qualifier=remove|sp_paren_qualifier=force|sp_paren_qualifier=not_defined
 ChoicesReadable="Ignore Sp Paren Qualifier|Add Sp Paren Qualifier|Remove Sp Paren Qualifier|Force Sp Paren Qualifier"
 ValueDefault=ignore
 
@@ -970,7 +987,7 @@ Category=1
 Description="<html>Add or remove space between ')' and 'noexcept'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_paren_noexcept=ignore|sp_paren_noexcept=add|sp_paren_noexcept=remove|sp_paren_noexcept=force
+Choices=sp_paren_noexcept=ignore|sp_paren_noexcept=add|sp_paren_noexcept=remove|sp_paren_noexcept=force|sp_paren_noexcept=not_defined
 ChoicesReadable="Ignore Sp Paren Noexcept|Add Sp Paren Noexcept|Remove Sp Paren Noexcept|Force Sp Paren Noexcept"
 ValueDefault=ignore
 
@@ -979,7 +996,7 @@ 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|sp_after_class_colon=not_defined
 ChoicesReadable="Ignore Sp After Class Colon|Add Sp After Class Colon|Remove Sp After Class Colon|Force Sp After Class Colon"
 ValueDefault=ignore
 
@@ -988,7 +1005,7 @@ 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|sp_before_class_colon=not_defined
 ChoicesReadable="Ignore Sp Before Class Colon|Add Sp Before Class Colon|Remove Sp Before Class Colon|Force Sp Before Class Colon"
 ValueDefault=ignore
 
@@ -997,7 +1014,7 @@ 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|sp_after_constr_colon=not_defined
 ChoicesReadable="Ignore Sp After Constr Colon|Add Sp After Constr Colon|Remove Sp After Constr Colon|Force Sp After Constr Colon"
 ValueDefault=ignore
 
@@ -1006,7 +1023,7 @@ 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|sp_before_constr_colon=not_defined
 ChoicesReadable="Ignore Sp Before Constr Colon|Add Sp Before Constr Colon|Remove Sp Before Constr Colon|Force Sp Before Constr Colon"
 ValueDefault=ignore
 
@@ -1015,7 +1032,7 @@ Category=1
 Description="<html>Add or remove space before case ':'.<br/><br/>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|sp_before_case_colon=not_defined
 ChoicesReadable="Ignore Sp Before Case Colon|Add Sp Before Case Colon|Remove Sp Before Case Colon|Force Sp Before Case Colon"
 ValueDefault=remove
 
@@ -1024,7 +1041,7 @@ 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|sp_after_operator=not_defined
 ChoicesReadable="Ignore Sp After Operator|Add Sp After Operator|Remove Sp After Operator|Force Sp After Operator"
 ValueDefault=ignore
 
@@ -1033,7 +1050,7 @@ Category=1
 Description="<html>Add or remove space between the operator symbol and the open parenthesis, as<br/>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|sp_after_operator_sym=not_defined
 ChoicesReadable="Ignore Sp After Operator Sym|Add Sp After Operator Sym|Remove Sp After Operator Sym|Force Sp After Operator Sym"
 ValueDefault=ignore
 
@@ -1042,7 +1059,7 @@ Category=1
 Description="<html>Overrides sp_after_operator_sym when the operator has no arguments, as in<br/>'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|sp_after_operator_sym_empty=not_defined
 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
 
@@ -1051,7 +1068,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force
+Choices=sp_after_cast=ignore|sp_after_cast=add|sp_after_cast=remove|sp_after_cast=force|sp_after_cast=not_defined
 ChoicesReadable="Ignore Sp After Cast|Add Sp After Cast|Remove Sp After Cast|Force Sp After Cast"
 ValueDefault=ignore
 
@@ -1060,7 +1077,7 @@ Category=1
 Description="<html>Add or remove spaces inside cast parentheses.</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|sp_inside_paren_cast=not_defined
 ChoicesReadable="Ignore Sp Inside Paren Cast|Add Sp Inside Paren Cast|Remove Sp Inside Paren Cast|Force Sp Inside Paren Cast"
 ValueDefault=ignore
 
@@ -1069,7 +1086,7 @@ 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>"
 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|sp_cpp_cast_paren=not_defined
 ChoicesReadable="Ignore Sp Cpp Cast Paren|Add Sp Cpp Cast Paren|Remove Sp Cpp Cast Paren|Force Sp Cpp Cast Paren"
 ValueDefault=ignore
 
@@ -1078,7 +1095,7 @@ 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|sp_sizeof_paren=not_defined
 ChoicesReadable="Ignore Sp Sizeof Paren|Add Sp Sizeof Paren|Remove Sp Sizeof Paren|Force Sp Sizeof Paren"
 ValueDefault=ignore
 
@@ -1087,7 +1104,7 @@ 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
+Choices=sp_sizeof_ellipsis=ignore|sp_sizeof_ellipsis=add|sp_sizeof_ellipsis=remove|sp_sizeof_ellipsis=force|sp_sizeof_ellipsis=not_defined
 ChoicesReadable="Ignore Sp Sizeof Ellipsis|Add Sp Sizeof Ellipsis|Remove Sp Sizeof Ellipsis|Force Sp Sizeof Ellipsis"
 ValueDefault=ignore
 
@@ -1096,7 +1113,7 @@ 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
+Choices=sp_sizeof_ellipsis_paren=ignore|sp_sizeof_ellipsis_paren=add|sp_sizeof_ellipsis_paren=remove|sp_sizeof_ellipsis_paren=force|sp_sizeof_ellipsis_paren=not_defined
 ChoicesReadable="Ignore Sp Sizeof Ellipsis Paren|Add Sp Sizeof Ellipsis Paren|Remove Sp Sizeof Ellipsis Paren|Force Sp Sizeof Ellipsis Paren"
 ValueDefault=ignore
 
@@ -1105,7 +1122,7 @@ 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
+Choices=sp_decltype_paren=ignore|sp_decltype_paren=add|sp_decltype_paren=remove|sp_decltype_paren=force|sp_decltype_paren=not_defined
 ChoicesReadable="Ignore Sp Decltype Paren|Add Sp Decltype Paren|Remove Sp Decltype Paren|Force Sp Decltype Paren"
 ValueDefault=ignore
 
@@ -1114,7 +1131,7 @@ Category=1
 Description="<html>(Pawn) Add or remove space after the tag keyword.</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|sp_after_tag=not_defined
 ChoicesReadable="Ignore Sp After Tag|Add Sp After Tag|Remove Sp After Tag|Force Sp After Tag"
 ValueDefault=ignore
 
@@ -1123,7 +1140,7 @@ 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|sp_inside_braces_enum=not_defined
 ChoicesReadable="Ignore Sp Inside Braces Enum|Add Sp Inside Braces Enum|Remove Sp Inside Braces Enum|Force Sp Inside Braces Enum"
 ValueDefault=ignore
 
@@ -1132,7 +1149,7 @@ 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|sp_inside_braces_struct=not_defined
 ChoicesReadable="Ignore Sp Inside Braces Struct|Add Sp Inside Braces Struct|Remove Sp Inside Braces Struct|Force Sp Inside Braces Struct"
 ValueDefault=ignore
 
@@ -1141,7 +1158,7 @@ Category=1
 Description="<html>(OC) Add or remove space inside Objective-C 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|sp_inside_braces_oc_dict=not_defined
 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
 
@@ -1150,7 +1167,7 @@ Category=1
 Description="<html>Add or remove space after open brace in an unnamed temporary<br/>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|sp_after_type_brace_init_lst_open=not_defined
 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
 
@@ -1159,7 +1176,7 @@ Category=1
 Description="<html>Add or remove space before close brace in an unnamed temporary<br/>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|sp_before_type_brace_init_lst_close=not_defined
 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
 
@@ -1168,7 +1185,7 @@ 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|sp_inside_type_brace_init_lst=not_defined
 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
 
@@ -1177,7 +1194,7 @@ 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|sp_inside_braces=not_defined
 ChoicesReadable="Ignore Sp Inside Braces|Add Sp Inside Braces|Remove Sp Inside Braces|Force Sp Inside Braces"
 ValueDefault=ignore
 
@@ -1186,7 +1203,7 @@ 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|sp_inside_braces_empty=not_defined
 ChoicesReadable="Ignore Sp Inside Braces Empty|Add Sp Inside Braces Empty|Remove Sp Inside Braces Empty|Force Sp Inside Braces Empty"
 ValueDefault=ignore
 
@@ -1195,7 +1212,7 @@ Category=1
 Description="<html>Add or remove space around trailing return operator '-&gt;'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_trailing_return=ignore|sp_trailing_return=add|sp_trailing_return=remove|sp_trailing_return=force
+Choices=sp_trailing_return=ignore|sp_trailing_return=add|sp_trailing_return=remove|sp_trailing_return=force|sp_trailing_return=not_defined
 ChoicesReadable="Ignore Sp Trailing Return|Add Sp Trailing Return|Remove Sp Trailing Return|Force Sp Trailing Return"
 ValueDefault=ignore
 
@@ -1204,7 +1221,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force
+Choices=sp_type_func=ignore|sp_type_func=add|sp_type_func=remove|sp_type_func=force|sp_type_func=not_defined
 ChoicesReadable="Ignore Sp Type Func|Add Sp Type Func|Remove Sp Type Func|Force Sp Type Func"
 ValueDefault=ignore
 
@@ -1213,7 +1230,7 @@ Category=1
 Description="<html>Add or remove space between type and open brace of an unnamed temporary<br/>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|sp_type_brace_init_lst=not_defined
 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
 
@@ -1222,7 +1239,7 @@ 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|sp_func_proto_paren=not_defined
 ChoicesReadable="Ignore Sp Func Proto Paren|Add Sp Func Proto Paren|Remove Sp Func Proto Paren|Force Sp Func Proto Paren"
 ValueDefault=ignore
 
@@ -1231,7 +1248,7 @@ Category=1
 Description="<html>Add or remove space between function name and '()' on function declaration<br/>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|sp_func_proto_paren_empty=not_defined
 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
 
@@ -1240,7 +1257,7 @@ Category=1
 Description="<html>Add or remove space between function name and '(' with a typedef specifier.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_func_type_paren=ignore|sp_func_type_paren=add|sp_func_type_paren=remove|sp_func_type_paren=force
+Choices=sp_func_type_paren=ignore|sp_func_type_paren=add|sp_func_type_paren=remove|sp_func_type_paren=force|sp_func_type_paren=not_defined
 ChoicesReadable="Ignore Sp Func Type Paren|Add Sp Func Type Paren|Remove Sp Func Type Paren|Force Sp Func Type Paren"
 ValueDefault=ignore
 
@@ -1249,7 +1266,7 @@ Category=1
 Description="<html>Add or remove space between alias name and '(' of a non-pointer function type typedef.</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|sp_func_def_paren=not_defined
 ChoicesReadable="Ignore Sp Func Def Paren|Add Sp Func Def Paren|Remove Sp Func Def Paren|Force Sp Func Def Paren"
 ValueDefault=ignore
 
@@ -1258,7 +1275,7 @@ Category=1
 Description="<html>Add or remove space between function name and '()' on function definition<br/>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|sp_func_def_paren_empty=not_defined
 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
 
@@ -1267,7 +1284,7 @@ Category=1
 Description="<html>Add or remove space inside empty function '()'.<br/>Overrides sp_after_angle unless use_sp_after_angle_always is set to true.</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|sp_inside_fparens=not_defined
 ChoicesReadable="Ignore Sp Inside Fparens|Add Sp Inside Fparens|Remove Sp Inside Fparens|Force Sp Inside Fparens"
 ValueDefault=ignore
 
@@ -1276,7 +1293,7 @@ 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|sp_inside_fparen=not_defined
 ChoicesReadable="Ignore Sp Inside Fparen|Add Sp Inside Fparen|Remove Sp Inside Fparen|Force Sp Inside Fparen"
 ValueDefault=ignore
 
@@ -1285,7 +1302,7 @@ Category=1
 Description="<html>Add or remove space inside the first parentheses in a function type, as in<br/>'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|sp_inside_tparen=not_defined
 ChoicesReadable="Ignore Sp Inside Tparen|Add Sp Inside Tparen|Remove Sp Inside Tparen|Force Sp Inside Tparen"
 ValueDefault=ignore
 
@@ -1294,7 +1311,7 @@ Category=1
 Description="<html>Add or remove space between the ')' and '(' in a function type, as in<br/>'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|sp_after_tparen_close=not_defined
 ChoicesReadable="Ignore Sp After Tparen Close|Add Sp After Tparen Close|Remove Sp After Tparen Close|Force Sp After Tparen Close"
 ValueDefault=ignore
 
@@ -1303,7 +1320,7 @@ 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|sp_square_fparen=not_defined
 ChoicesReadable="Ignore Sp Square Fparen|Add Sp Square Fparen|Remove Sp Square Fparen|Force Sp Square Fparen"
 ValueDefault=ignore
 
@@ -1312,7 +1329,7 @@ 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|sp_fparen_brace=not_defined
 ChoicesReadable="Ignore Sp Fparen Brace|Add Sp Fparen Brace|Remove Sp Fparen Brace|Force Sp Fparen Brace"
 ValueDefault=ignore
 
@@ -1321,7 +1338,7 @@ Category=1
 Description="<html>Add or remove space between ')' and '{' of a function call in object<br/>initialization.<br/><br/>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|sp_fparen_brace_initializer=not_defined
 ChoicesReadable="Ignore Sp Fparen Brace Initializer|Add Sp Fparen Brace Initializer|Remove Sp Fparen Brace Initializer|Force Sp Fparen Brace Initializer"
 ValueDefault=ignore
 
@@ -1330,7 +1347,7 @@ Category=1
 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|sp_fparen_dbrace=not_defined
 ChoicesReadable="Ignore Sp Fparen Dbrace|Add Sp Fparen Dbrace|Remove Sp Fparen Dbrace|Force Sp Fparen Dbrace"
 ValueDefault=ignore
 
@@ -1339,7 +1356,7 @@ 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|sp_func_call_paren=not_defined
 ChoicesReadable="Ignore Sp Func Call Paren|Add Sp Func Call Paren|Remove Sp Func Call Paren|Force Sp Func Call Paren"
 ValueDefault=ignore
 
@@ -1348,7 +1365,7 @@ 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>"
 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|sp_func_call_paren_empty=not_defined
 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
 
@@ -1357,7 +1374,7 @@ 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>"
 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|sp_func_call_user_paren=not_defined
 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
 
@@ -1366,7 +1383,7 @@ Category=1
 Description="<html>Add or remove space inside user function '(' and ')'.</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|sp_func_call_user_inside_fparen=not_defined
 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
 
@@ -1375,7 +1392,7 @@ Category=1
 Description="<html>Add or remove space between nested parentheses with user functions,<br/>i.e. '((' vs. '( ('.</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|sp_func_call_user_paren_paren=not_defined
 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
 
@@ -1384,7 +1401,7 @@ Category=1
 Description="<html>Add or remove space between a constructor/destructor and the open<br/>parenthesis.</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|sp_func_class_paren=not_defined
 ChoicesReadable="Ignore Sp Func Class Paren|Add Sp Func Class Paren|Remove Sp Func Class Paren|Force Sp Func Class Paren"
 ValueDefault=ignore
 
@@ -1393,7 +1410,7 @@ Category=1
 Description="<html>Add or remove space between a constructor without parameters or destructor<br/>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|sp_func_class_paren_empty=not_defined
 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
 
@@ -1402,7 +1419,7 @@ 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|sp_return_paren=not_defined
 ChoicesReadable="Ignore Sp Return Paren|Add Sp Return Paren|Remove Sp Return Paren|Force Sp Return Paren"
 ValueDefault=ignore
 
@@ -1411,7 +1428,7 @@ 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
+Choices=sp_return_brace=ignore|sp_return_brace=add|sp_return_brace=remove|sp_return_brace=force|sp_return_brace=not_defined
 ChoicesReadable="Ignore Sp Return Brace|Add Sp Return Brace|Remove Sp Return Brace|Force Sp Return Brace"
 ValueDefault=ignore
 
@@ -1420,7 +1437,7 @@ 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|sp_attribute_paren=not_defined
 ChoicesReadable="Ignore Sp Attribute Paren|Add Sp Attribute Paren|Remove Sp Attribute Paren|Force Sp Attribute Paren"
 ValueDefault=ignore
 
@@ -1429,7 +1446,7 @@ 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|sp_defined_paren=not_defined
 ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren"
 ValueDefault=ignore
 
@@ -1438,7 +1455,7 @@ 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|sp_throw_paren=not_defined
 ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
 ValueDefault=ignore
 
@@ -1447,7 +1464,7 @@ Category=1
 Description="<html>Add or remove space between 'throw' and anything other than '(' as in<br/>'@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|sp_after_throw=not_defined
 ChoicesReadable="Ignore Sp After Throw|Add Sp After Throw|Remove Sp After Throw|Force Sp After Throw"
 ValueDefault=ignore
 
@@ -1456,7 +1473,7 @@ 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>"
 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|sp_catch_paren=not_defined
 ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
 ValueDefault=ignore
 
@@ -1465,7 +1482,7 @@ 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>"
 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|sp_oc_catch_paren=not_defined
 ChoicesReadable="Ignore Sp Oc Catch Paren|Add Sp Oc Catch Paren|Remove Sp Oc Catch Paren|Force Sp Oc Catch Paren"
 ValueDefault=ignore
 
@@ -1474,7 +1491,7 @@ Category=1
 Description="<html>(OC) Add or remove space before Objective-C protocol list<br/>as in '@protocol Protocol&lt;here&gt;&lt;Protocol_A&gt;' or '@interface MyClass : NSObject&lt;here&gt;&lt;MyProtocol&gt;'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_oc_proto_list=ignore|sp_before_oc_proto_list=add|sp_before_oc_proto_list=remove|sp_before_oc_proto_list=force
+Choices=sp_before_oc_proto_list=ignore|sp_before_oc_proto_list=add|sp_before_oc_proto_list=remove|sp_before_oc_proto_list=force|sp_before_oc_proto_list=not_defined
 ChoicesReadable="Ignore Sp Before Oc Proto List|Add Sp Before Oc Proto List|Remove Sp Before Oc Proto List|Force Sp Before Oc Proto List"
 ValueDefault=ignore
 
@@ -1483,7 +1500,7 @@ Category=1
 Description="<html>(OC) Add or remove space between class name and '('<br/>in '@interface className(categoryName)&lt;ProtocolName&gt;:BaseClass'</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_oc_classname_paren=ignore|sp_oc_classname_paren=add|sp_oc_classname_paren=remove|sp_oc_classname_paren=force
+Choices=sp_oc_classname_paren=ignore|sp_oc_classname_paren=add|sp_oc_classname_paren=remove|sp_oc_classname_paren=force|sp_oc_classname_paren=not_defined
 ChoicesReadable="Ignore Sp Oc Classname Paren|Add Sp Oc Classname Paren|Remove Sp Oc Classname Paren|Force Sp Oc Classname Paren"
 ValueDefault=ignore
 
@@ -1492,7 +1509,7 @@ 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>"
 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|sp_version_paren=not_defined
 ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
 ValueDefault=ignore
 
@@ -1501,7 +1518,7 @@ 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>"
 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|sp_scope_paren=not_defined
 ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
 ValueDefault=ignore
 
@@ -1510,7 +1527,7 @@ Category=1
 Description="<html>Add or remove space between 'super' and '(' in 'super (something)'.<br/><br/>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|sp_super_paren=not_defined
 ChoicesReadable="Ignore Sp Super Paren|Add Sp Super Paren|Remove Sp Super Paren|Force Sp Super Paren"
 ValueDefault=remove
 
@@ -1519,7 +1536,7 @@ Category=1
 Description="<html>Add or remove space between 'this' and '(' in 'this (something)'.<br/><br/>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|sp_this_paren=not_defined
 ChoicesReadable="Ignore Sp This Paren|Add Sp This Paren|Remove Sp This Paren|Force Sp This Paren"
 ValueDefault=remove
 
@@ -1528,7 +1545,7 @@ Category=1
 Description="<html>Add or remove space between a macro name and its definition.</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|sp_macro=not_defined
 ChoicesReadable="Ignore Sp Macro|Add Sp Macro|Remove Sp Macro|Force Sp Macro"
 ValueDefault=ignore
 
@@ -1537,7 +1554,7 @@ Category=1
 Description="<html>Add or remove space between a macro function ')' and its definition.</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|sp_macro_func=not_defined
 ChoicesReadable="Ignore Sp Macro Func|Add Sp Macro Func|Remove Sp Macro Func|Force Sp Macro Func"
 ValueDefault=ignore
 
@@ -1546,7 +1563,7 @@ 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|sp_else_brace=not_defined
 ChoicesReadable="Ignore Sp Else Brace|Add Sp Else Brace|Remove Sp Else Brace|Force Sp Else Brace"
 ValueDefault=ignore
 
@@ -1555,7 +1572,7 @@ 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|sp_brace_else=not_defined
 ChoicesReadable="Ignore Sp Brace Else|Add Sp Brace Else|Remove Sp Brace Else|Force Sp Brace Else"
 ValueDefault=ignore
 
@@ -1564,7 +1581,7 @@ 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|sp_brace_typedef=not_defined
 ChoicesReadable="Ignore Sp Brace Typedef|Add Sp Brace Typedef|Remove Sp Brace Typedef|Force Sp Brace Typedef"
 ValueDefault=ignore
 
@@ -1573,7 +1590,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force
+Choices=sp_catch_brace=ignore|sp_catch_brace=add|sp_catch_brace=remove|sp_catch_brace=force|sp_catch_brace=not_defined
 ChoicesReadable="Ignore Sp Catch Brace|Add Sp Catch Brace|Remove Sp Catch Brace|Force Sp Catch Brace"
 ValueDefault=ignore
 
@@ -1582,7 +1599,7 @@ 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>"
 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|sp_oc_catch_brace=not_defined
 ChoicesReadable="Ignore Sp Oc Catch Brace|Add Sp Oc Catch Brace|Remove Sp Oc Catch Brace|Force Sp Oc Catch Brace"
 ValueDefault=ignore
 
@@ -1591,7 +1608,7 @@ 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|sp_brace_catch=not_defined
 ChoicesReadable="Ignore Sp Brace Catch|Add Sp Brace Catch|Remove Sp Brace Catch|Force Sp Brace Catch"
 ValueDefault=ignore
 
@@ -1600,7 +1617,7 @@ 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>"
 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|sp_oc_brace_catch=not_defined
 ChoicesReadable="Ignore Sp Oc Brace Catch|Add Sp Oc Brace Catch|Remove Sp Oc Brace Catch|Force Sp Oc Brace Catch"
 ValueDefault=ignore
 
@@ -1609,7 +1626,7 @@ 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|sp_finally_brace=not_defined
 ChoicesReadable="Ignore Sp Finally Brace|Add Sp Finally Brace|Remove Sp Finally Brace|Force Sp Finally Brace"
 ValueDefault=ignore
 
@@ -1618,7 +1635,7 @@ 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|sp_brace_finally=not_defined
 ChoicesReadable="Ignore Sp Brace Finally|Add Sp Brace Finally|Remove Sp Brace Finally|Force Sp Brace Finally"
 ValueDefault=ignore
 
@@ -1627,7 +1644,7 @@ 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|sp_try_brace=not_defined
 ChoicesReadable="Ignore Sp Try Brace|Add Sp Try Brace|Remove Sp Try Brace|Force Sp Try Brace"
 ValueDefault=ignore
 
@@ -1636,7 +1653,7 @@ 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|sp_getset_brace=not_defined
 ChoicesReadable="Ignore Sp Getset Brace|Add Sp Getset Brace|Remove Sp Getset Brace|Force Sp Getset Brace"
 ValueDefault=ignore
 
@@ -1645,7 +1662,7 @@ Category=1
 Description="<html>Add or remove space between a variable and '{' for C++ uniform<br/>initialization.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_word_brace_init_lst=ignore|sp_word_brace_init_lst=add|sp_word_brace_init_lst=remove|sp_word_brace_init_lst=force
+Choices=sp_word_brace_init_lst=ignore|sp_word_brace_init_lst=add|sp_word_brace_init_lst=remove|sp_word_brace_init_lst=force|sp_word_brace_init_lst=not_defined
 ChoicesReadable="Ignore Sp Word Brace Init Lst|Add Sp Word Brace Init Lst|Remove Sp Word Brace Init Lst|Force Sp Word Brace Init Lst"
 ValueDefault=ignore
 
@@ -1654,7 +1671,7 @@ Category=1
 Description="<html>Add or remove space between a variable and '{' for a namespace.<br/><br/>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|sp_word_brace_ns=not_defined
 ChoicesReadable="Ignore Sp Word Brace Ns|Add Sp Word Brace Ns|Remove Sp Word Brace Ns|Force Sp Word Brace Ns"
 ValueDefault=add
 
@@ -1663,7 +1680,7 @@ 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|sp_before_dc=not_defined
 ChoicesReadable="Ignore Sp Before Dc|Add Sp Before Dc|Remove Sp Before Dc|Force Sp Before Dc"
 ValueDefault=ignore
 
@@ -1672,7 +1689,7 @@ 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|sp_after_dc=not_defined
 ChoicesReadable="Ignore Sp After Dc|Add Sp After Dc|Remove Sp After Dc|Force Sp After Dc"
 ValueDefault=ignore
 
@@ -1681,7 +1698,7 @@ Category=1
 Description="<html>(D) 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|sp_d_array_colon=not_defined
 ChoicesReadable="Ignore Sp D Array Colon|Add Sp D Array Colon|Remove Sp D Array Colon|Force Sp D Array Colon"
 ValueDefault=ignore
 
@@ -1690,7 +1707,7 @@ Category=1
 Description="<html>Add or remove space after the '!' (not) unary operator.<br/><br/>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|sp_not=not_defined
 ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
 ValueDefault=remove
 
@@ -1699,7 +1716,7 @@ Category=1
 Description="<html>Add or remove space after the '~' (invert) unary operator.<br/><br/>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|sp_inv=not_defined
 ChoicesReadable="Ignore Sp Inv|Add Sp Inv|Remove Sp Inv|Force Sp Inv"
 ValueDefault=remove
 
@@ -1708,7 +1725,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force
+Choices=sp_addr=ignore|sp_addr=add|sp_addr=remove|sp_addr=force|sp_addr=not_defined
 ChoicesReadable="Ignore Sp Addr|Add Sp Addr|Remove Sp Addr|Force Sp Addr"
 ValueDefault=remove
 
@@ -1717,7 +1734,7 @@ Category=1
 Description="<html>Add or remove space around the '.' or '-&gt;' operators.<br/><br/>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|sp_member=not_defined
 ChoicesReadable="Ignore Sp Member|Add Sp Member|Remove Sp Member|Force Sp Member"
 ValueDefault=remove
 
@@ -1726,7 +1743,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force
+Choices=sp_deref=ignore|sp_deref=add|sp_deref=remove|sp_deref=force|sp_deref=not_defined
 ChoicesReadable="Ignore Sp Deref|Add Sp Deref|Remove Sp Deref|Force Sp Deref"
 ValueDefault=remove
 
@@ -1735,7 +1752,7 @@ Category=1
 Description="<html>Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.<br/><br/>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|sp_sign=not_defined
 ChoicesReadable="Ignore Sp Sign|Add Sp Sign|Remove Sp Sign|Force Sp Sign"
 ValueDefault=remove
 
@@ -1744,7 +1761,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force
+Choices=sp_incdec=ignore|sp_incdec=add|sp_incdec=remove|sp_incdec=force|sp_incdec=not_defined
 ChoicesReadable="Ignore Sp Incdec|Add Sp Incdec|Remove Sp Incdec|Force Sp Incdec"
 ValueDefault=remove
 
@@ -1753,7 +1770,7 @@ Category=1
 Description="<html>Add or remove space before a backslash-newline at the end of a line.<br/><br/>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|sp_before_nl_cont=not_defined
 ChoicesReadable="Ignore Sp Before Nl Cont|Add Sp Before Nl Cont|Remove Sp Before Nl Cont|Force Sp Before Nl Cont"
 ValueDefault=add
 
@@ -1762,7 +1779,7 @@ Category=1
 Description="<html>(OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'<br/>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|sp_after_oc_scope=not_defined
 ChoicesReadable="Ignore Sp After Oc Scope|Add Sp After Oc Scope|Remove Sp After Oc Scope|Force Sp After Oc Scope"
 ValueDefault=ignore
 
@@ -1771,7 +1788,7 @@ 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>"
 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|sp_after_oc_colon=not_defined
 ChoicesReadable="Ignore Sp After Oc Colon|Add Sp After Oc Colon|Remove Sp After Oc Colon|Force Sp After Oc Colon"
 ValueDefault=ignore
 
@@ -1780,7 +1797,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_oc_colon=ignore|sp_before_oc_colon=add|sp_before_oc_colon=remove|sp_before_oc_colon=force
+Choices=sp_before_oc_colon=ignore|sp_before_oc_colon=add|sp_before_oc_colon=remove|sp_before_oc_colon=force|sp_before_oc_colon=not_defined
 ChoicesReadable="Ignore Sp Before Oc Colon|Add Sp Before Oc Colon|Remove Sp Before Oc Colon|Force Sp Before Oc Colon"
 ValueDefault=ignore
 
@@ -1789,7 +1806,7 @@ Category=1
 Description="<html>(OC) 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|sp_after_oc_dict_colon=not_defined
 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
 
@@ -1798,7 +1815,7 @@ Category=1
 Description="<html>(OC) 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|sp_before_oc_dict_colon=not_defined
 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
 
@@ -1807,7 +1824,7 @@ 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>"
 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|sp_after_send_oc_colon=not_defined
 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
 
@@ -1816,7 +1833,7 @@ 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>"
 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|sp_before_send_oc_colon=not_defined
 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
 
@@ -1825,7 +1842,7 @@ 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>"
 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|sp_after_oc_type=not_defined
 ChoicesReadable="Ignore Sp After Oc Type|Add Sp After Oc Type|Remove Sp After Oc Type|Force Sp After Oc Type"
 ValueDefault=ignore
 
@@ -1834,7 +1851,7 @@ 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>"
 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|sp_after_oc_return_type=not_defined
 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
 
@@ -1843,7 +1860,7 @@ 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>"
 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|sp_after_oc_at_sel=not_defined
 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
 
@@ -1852,7 +1869,7 @@ 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>"
 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|sp_after_oc_at_sel_parens=not_defined
 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
 
@@ -1861,7 +1878,7 @@ 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>"
 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|sp_inside_oc_at_sel_parens=not_defined
 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
 
@@ -1870,7 +1887,7 @@ 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>"
 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|sp_before_oc_block_caret=not_defined
 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
 
@@ -1879,7 +1896,7 @@ 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>"
 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|sp_after_oc_block_caret=not_defined
 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
 
@@ -1888,7 +1905,7 @@ Category=1
 Description="<html>(OC) Add or remove space between the receiver and selector in a message,<br/>as in '[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|sp_after_oc_msg_receiver=not_defined
 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
 
@@ -1897,7 +1914,7 @@ Category=1
 Description="<html>(OC) 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|sp_after_oc_property=not_defined
 ChoicesReadable="Ignore Sp After Oc Property|Add Sp After Oc Property|Remove Sp After Oc Property|Force Sp After Oc Property"
 ValueDefault=ignore
 
@@ -1906,7 +1923,7 @@ Category=1
 Description="<html>(OC) Add or remove space between '@synchronized' and the open parenthesis,<br/>i.e. '@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|sp_after_oc_synchronized=not_defined
 ChoicesReadable="Ignore Sp After Oc Synchronized|Add Sp After Oc Synchronized|Remove Sp After Oc Synchronized|Force Sp After Oc Synchronized"
 ValueDefault=ignore
 
@@ -1915,7 +1932,7 @@ 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|sp_cond_colon=not_defined
 ChoicesReadable="Ignore Sp Cond Colon|Add Sp Cond Colon|Remove Sp Cond Colon|Force Sp Cond Colon"
 ValueDefault=ignore
 
@@ -1924,7 +1941,7 @@ Category=1
 Description="<html>Add or remove space before the ':' in 'b ? t : f'.<br/><br/>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|sp_cond_colon_before=not_defined
 ChoicesReadable="Ignore Sp Cond Colon Before|Add Sp Cond Colon Before|Remove Sp Cond Colon Before|Force Sp Cond Colon Before"
 ValueDefault=ignore
 
@@ -1933,7 +1950,7 @@ Category=1
 Description="<html>Add or remove space after the ':' in 'b ? t : f'.<br/><br/>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|sp_cond_colon_after=not_defined
 ChoicesReadable="Ignore Sp Cond Colon After|Add Sp Cond Colon After|Remove Sp Cond Colon After|Force Sp Cond Colon After"
 ValueDefault=ignore
 
@@ -1942,7 +1959,7 @@ 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|sp_cond_question=not_defined
 ChoicesReadable="Ignore Sp Cond Question|Add Sp Cond Question|Remove Sp Cond Question|Force Sp Cond Question"
 ValueDefault=ignore
 
@@ -1951,7 +1968,7 @@ Category=1
 Description="<html>Add or remove space before the '?' in 'b ? t : f'.<br/><br/>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|sp_cond_question_before=not_defined
 ChoicesReadable="Ignore Sp Cond Question Before|Add Sp Cond Question Before|Remove Sp Cond Question Before|Force Sp Cond Question Before"
 ValueDefault=ignore
 
@@ -1960,7 +1977,7 @@ Category=1
 Description="<html>Add or remove space after the '?' in 'b ? t : f'.<br/><br/>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|sp_cond_question_after=not_defined
 ChoicesReadable="Ignore Sp Cond Question After|Add Sp Cond Question After|Remove Sp Cond Question After|Force Sp Cond Question After"
 ValueDefault=ignore
 
@@ -1969,7 +1986,7 @@ 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>"
 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|sp_cond_ternary_short=not_defined
 ChoicesReadable="Ignore Sp Cond Ternary Short|Add Sp Cond Ternary Short|Remove Sp Cond Ternary Short|Force Sp Cond Ternary Short"
 ValueDefault=ignore
 
@@ -1978,7 +1995,7 @@ Category=1
 Description="<html>Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make<br/>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|sp_case_label=not_defined
 ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label"
 ValueDefault=ignore
 
@@ -1987,49 +2004,58 @@ Category=1
 Description="<html>(D) Add or remove 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|sp_range=not_defined
 ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range"
 ValueDefault=ignore
 
 [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>Add or remove space after ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var : &lt;here&gt; expr)'.</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|sp_after_for_colon=not_defined
 ChoicesReadable="Ignore Sp After For Colon|Add Sp After For Colon|Remove Sp After For Colon|Force Sp After For Colon"
 ValueDefault=ignore
 
 [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>Add or remove space before ':' in a Java/C++11 range-based 'for',<br/>as in 'for (Type var &lt;here&gt; : expr)'.</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|sp_before_for_colon=not_defined
 ChoicesReadable="Ignore Sp Before For Colon|Add Sp Before For Colon|Remove Sp Before For Colon|Force Sp Before For Colon"
 ValueDefault=ignore
 
 [Sp Extern Paren]
 Category=1
-Description="<html>(D) Add or remove space between 'extern' and '(' as in 'extern (C)'.</html>"
+Description="<html>(D) Add or remove space between 'extern' and '(' as in 'extern &lt;here&gt; (C)'.</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|sp_extern_paren=not_defined
 ChoicesReadable="Ignore Sp Extern Paren|Add Sp Extern Paren|Remove Sp Extern Paren|Force Sp Extern Paren"
 ValueDefault=ignore
 
 [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>Add or remove space after the opening of a C++ comment, as in '// &lt;here&gt; 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|sp_cmt_cpp_start=not_defined
 ChoicesReadable="Ignore Sp Cmt Cpp Start|Add Sp Cmt Cpp Start|Remove Sp Cmt Cpp Start|Force Sp Cmt Cpp Start"
 ValueDefault=ignore
 
+[Sp Cmt Cpp Region]
+Category=1
+Description="<html>Add or remove space in a C++ region marker comment, as in '// &lt;here&gt; BEGIN'.<br/>A region marker is defined as a comment which is not preceded by other text<br/>(i.e. the comment is the first non-whitespace on the line), and which starts<br/>with either 'BEGIN' or 'END'.<br/><br/>Overrides sp_cmt_cpp_start.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cmt_cpp_region=ignore|sp_cmt_cpp_region=add|sp_cmt_cpp_region=remove|sp_cmt_cpp_region=force|sp_cmt_cpp_region=not_defined
+ChoicesReadable="Ignore Sp Cmt Cpp Region|Add Sp Cmt Cpp Region|Remove Sp Cmt Cpp Region|Force Sp Cmt Cpp Region"
+ValueDefault=ignore
+
 [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>If true, space added with sp_cmt_cpp_start will be added after Doxygen<br/>sequences like '///', '///&lt;', '//!' and '//!&lt;'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=sp_cmt_cpp_doxygen=true|sp_cmt_cpp_doxygen=false
@@ -2037,7 +2063,7 @@ ValueDefault=false
 
 [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>If true, space added with sp_cmt_cpp_start will be added after Qt translator<br/>or meta-data comments like '//:', '//=', and '//~'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=sp_cmt_cpp_qttr=true|sp_cmt_cpp_qttr=false
@@ -2048,7 +2074,7 @@ Category=1
 Description="<html>Add or remove space 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|sp_endif_cmt=not_defined
 ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
 ValueDefault=ignore
 
@@ -2057,7 +2083,7 @@ Category=1
 Description="<html>Add or remove space 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|sp_after_new=not_defined
 ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
 ValueDefault=ignore
 
@@ -2066,7 +2092,7 @@ Category=1
 Description="<html>Add or remove space 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|sp_between_new_paren=not_defined
 ChoicesReadable="Ignore Sp Between New Paren|Add Sp Between New Paren|Remove Sp Between New Paren|Force Sp Between New Paren"
 ValueDefault=ignore
 
@@ -2075,7 +2101,7 @@ Category=1
 Description="<html>Add or remove space 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|sp_after_newop_paren=not_defined
 ChoicesReadable="Ignore Sp After Newop Paren|Add Sp After Newop Paren|Remove Sp After Newop Paren|Force Sp After Newop Paren"
 ValueDefault=ignore
 
@@ -2084,7 +2110,7 @@ Category=1
 Description="<html>Add or remove space inside parenthesis of the new operator<br/>as in '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|sp_inside_newop_paren=not_defined
 ChoicesReadable="Ignore Sp Inside Newop Paren|Add Sp Inside Newop Paren|Remove Sp Inside Newop Paren|Force Sp Inside Newop Paren"
 ValueDefault=ignore
 
@@ -2093,7 +2119,7 @@ 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>"
 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|sp_inside_newop_paren_open=not_defined
 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
 
@@ -2102,7 +2128,7 @@ 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>"
 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|sp_inside_newop_paren_close=not_defined
 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
 
@@ -2111,7 +2137,7 @@ Category=1
 Description="<html>Add or remove space 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|sp_before_tr_emb_cmt=not_defined
 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
 
@@ -2130,7 +2156,7 @@ Category=1
 Description="<html>(Java) Add or remove space between an annotation and the open parenthesis.</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|sp_annotation_paren=not_defined
 ChoicesReadable="Ignore Sp Annotation Paren|Add Sp Annotation Paren|Remove Sp Annotation Paren|Force Sp Annotation Paren"
 ValueDefault=ignore
 
@@ -2147,7 +2173,7 @@ Category=1
 Description="<html>Add or remove 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|sp_after_noexcept=not_defined
 ChoicesReadable="Ignore Sp After Noexcept|Add Sp After Noexcept|Remove Sp After Noexcept|Force Sp After Noexcept"
 ValueDefault=ignore
 
@@ -2156,7 +2182,7 @@ Category=1
 Description="<html>Add or remove space after '_'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_vala_after_translation=ignore|sp_vala_after_translation=add|sp_vala_after_translation=remove|sp_vala_after_translation=force
+Choices=sp_vala_after_translation=ignore|sp_vala_after_translation=add|sp_vala_after_translation=remove|sp_vala_after_translation=force|sp_vala_after_translation=not_defined
 ChoicesReadable="Ignore Sp Vala After Translation|Add Sp Vala After Translation|Remove Sp Vala After Translation|Force Sp Vala After Translation"
 ValueDefault=ignore
 
@@ -2377,6 +2403,16 @@ EditorType=boolean
 TrueFalse=indent_class=true|indent_class=false
 ValueDefault=false
 
+[Indent Before Class Colon]
+Category=2
+Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires a newline break before colon (see pos_class_colon<br/>and nl_class_colon)</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_before_class_colon="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
 [Indent Class Colon]
 Category=2
 Description="<html>Whether to indent the stuff after a leading base class colon.</html>"
@@ -2605,7 +2641,7 @@ ValueDefault=false
 
 [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'. Usually 0 or indent_columns.<br/>It might wise to choose the same value for the option indent_case_brace.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_switch_case="
@@ -2613,6 +2649,16 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
+[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.<br/>It might wise to choose the same value for the option indent_switch_case.</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_case_brace="
+MinVal=-16
+MaxVal=16
+ValueDefault=0
+
 [Indent Switch Break With Case]
 Category=2
 Description="<html>indent 'break' with 'case' from 'switch'.</html>"
@@ -2639,16 +2685,6 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
-[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>"
-Enabled=false
-EditorType=numeric
-CallName="indent_case_brace="
-MinVal=-16
-MaxVal=16
-ValueDefault=0
-
 [Indent Col1 Comment]
 Category=2
 Description="<html>Whether to indent comments found in first column.</html>"
@@ -2735,6 +2771,14 @@ EditorType=boolean
 TrueFalse=indent_paren_after_func_call=true|indent_paren_after_func_call=false
 ValueDefault=false
 
+[Indent Comma Brace]
+Category=2
+Description="<html>Whether to indent a comma when inside a brace.<br/>If true, aligns under the open brace.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_comma_brace=true|indent_comma_brace=false
+ValueDefault=false
+
 [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>"
@@ -2935,7 +2979,7 @@ ValueDefault=false
 
 [Indent Compound Literal Return]
 Category=2
-Description="<html>How to indent compound literals that are being returned.<br/>true: add both the indent from return &amp; the compound literal open brace (ie:<br/>      2 indent levels)<br/>false: only indent 1 level, don't add the indent for the open brace, only add<br/>       the indent for the return.<br/><br/>Default: true</html>"
+Description="<html>How to indent compound literals that are being returned.<br/>true: add both the indent from return &amp; the compound literal open brace<br/>      (i.e. 2 indent levels)<br/>false: only indent 1 level, don't add the indent for the open brace, only<br/>       add the indent for the return.<br/><br/>Default: true</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_compound_literal_return=true|indent_compound_literal_return=false
@@ -2961,7 +3005,7 @@ ValueDefault=0
 
 [Indent Inside Ternary Operator]
 Category=2
-Description="<html>Whether to indent the statments inside ternary operator.</html>"
+Description="<html>Whether to indent the statements inside ternary operator.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_inside_ternary_operator=true|indent_inside_ternary_operator=false
@@ -3087,6 +3131,14 @@ EditorType=boolean
 TrueFalse=nl_while_leave_one_liners=true|nl_while_leave_one_liners=false
 ValueDefault=false
 
+[Nl Do Leave One Liners]
+Category=3
+Description="<html>Don't split one-line do statements, as in 'do { b++; } while(...);'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=nl_do_leave_one_liners=true|nl_do_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>"
@@ -3108,7 +3160,7 @@ 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
+Choices=nl_oc_mdef_brace=ignore|nl_oc_mdef_brace=add|nl_oc_mdef_brace=remove|nl_oc_mdef_brace=force|nl_oc_mdef_brace=not_defined
 ChoicesReadable="Ignore Nl Oc Mdef Brace|Add Nl Oc Mdef Brace|Remove Nl Oc Mdef Brace|Force Nl Oc Mdef Brace"
 ValueDefault=ignore
 
@@ -3117,7 +3169,7 @@ Category=3
 Description="<html>(OC) 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|nl_oc_block_brace=not_defined
 ChoicesReadable="Ignore Nl Oc Block Brace|Add Nl Oc Block Brace|Remove Nl Oc Block Brace|Force Nl Oc Block Brace"
 ValueDefault=ignore
 
@@ -3126,7 +3178,7 @@ Category=3
 Description="<html>(OC) Add or remove blank line before '@interface' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_before_interface=ignore|nl_oc_before_interface=add|nl_oc_before_interface=remove|nl_oc_before_interface=force
+Choices=nl_oc_before_interface=ignore|nl_oc_before_interface=add|nl_oc_before_interface=remove|nl_oc_before_interface=force|nl_oc_before_interface=not_defined
 ChoicesReadable="Ignore Nl Oc Before Interface|Add Nl Oc Before Interface|Remove Nl Oc Before Interface|Force Nl Oc Before Interface"
 ValueDefault=ignore
 
@@ -3135,7 +3187,7 @@ Category=3
 Description="<html>(OC) Add or remove blank line before '@implementation' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_before_implementation=ignore|nl_oc_before_implementation=add|nl_oc_before_implementation=remove|nl_oc_before_implementation=force
+Choices=nl_oc_before_implementation=ignore|nl_oc_before_implementation=add|nl_oc_before_implementation=remove|nl_oc_before_implementation=force|nl_oc_before_implementation=not_defined
 ChoicesReadable="Ignore Nl Oc Before Implementation|Add Nl Oc Before Implementation|Remove Nl Oc Before Implementation|Force Nl Oc Before Implementation"
 ValueDefault=ignore
 
@@ -3144,7 +3196,7 @@ Category=3
 Description="<html>(OC) Add or remove blank line before '@end' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_oc_before_end=ignore|nl_oc_before_end=add|nl_oc_before_end=remove|nl_oc_before_end=force
+Choices=nl_oc_before_end=ignore|nl_oc_before_end=add|nl_oc_before_end=remove|nl_oc_before_end=force|nl_oc_before_end=not_defined
 ChoicesReadable="Ignore Nl Oc Before End|Add Nl Oc Before End|Remove Nl Oc Before End|Force Nl Oc Before End"
 ValueDefault=ignore
 
@@ -3153,7 +3205,7 @@ Category=3
 Description="<html>(OC) 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|nl_oc_interface_brace=not_defined
 ChoicesReadable="Ignore Nl Oc Interface Brace|Add Nl Oc Interface Brace|Remove Nl Oc Interface Brace|Force Nl Oc Interface Brace"
 ValueDefault=ignore
 
@@ -3162,7 +3214,7 @@ Category=3
 Description="<html>(OC) 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|nl_oc_implementation_brace=not_defined
 ChoicesReadable="Ignore Nl Oc Implementation Brace|Add Nl Oc Implementation Brace|Remove Nl Oc Implementation Brace|Force Nl Oc Implementation Brace"
 ValueDefault=ignore
 
@@ -3171,7 +3223,7 @@ 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|nl_start_of_file=not_defined
 ChoicesReadable="Ignore Nl Start Of File|Add Nl Start Of File|Remove Nl Start Of File|Force Nl Start Of File"
 ValueDefault=ignore
 
@@ -3190,7 +3242,7 @@ Category=3
 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|nl_end_of_file=not_defined
 ChoicesReadable="Ignore Nl End Of File|Add Nl End Of File|Remove Nl End Of File|Force Nl End Of File"
 ValueDefault=ignore
 
@@ -3209,7 +3261,7 @@ Category=3
 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|nl_assign_brace=not_defined
 ChoicesReadable="Ignore Nl Assign Brace|Add Nl Assign Brace|Remove Nl Assign Brace|Force Nl Assign Brace"
 ValueDefault=ignore
 
@@ -3218,7 +3270,7 @@ Category=3
 Description="<html>(D) Add or remove newline between '=' and '['.</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|nl_assign_square=not_defined
 ChoicesReadable="Ignore Nl Assign Square|Add Nl Assign Square|Remove Nl Assign Square|Force Nl Assign Square"
 ValueDefault=ignore
 
@@ -3227,7 +3279,7 @@ 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|nl_tsquare_brace=not_defined
 ChoicesReadable="Ignore Nl Tsquare Brace|Add Nl Tsquare Brace|Remove Nl Tsquare Brace|Force Nl Tsquare Brace"
 ValueDefault=ignore
 
@@ -3236,7 +3288,7 @@ Category=3
 Description="<html>(D) Add or remove newline after '= ['. Will also affect the newline before<br/>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|nl_after_square_assign=not_defined
 ChoicesReadable="Ignore Nl After Square Assign|Add Nl After Square Assign|Remove Nl After Square Assign|Force Nl After Square Assign"
 ValueDefault=ignore
 
@@ -3245,7 +3297,7 @@ Category=3
 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|nl_fcall_brace=not_defined
 ChoicesReadable="Ignore Nl Fcall Brace|Add Nl Fcall Brace|Remove Nl Fcall Brace|Force Nl Fcall Brace"
 ValueDefault=ignore
 
@@ -3254,7 +3306,7 @@ 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|nl_enum_brace=not_defined
 ChoicesReadable="Ignore Nl Enum Brace|Add Nl Enum Brace|Remove Nl Enum Brace|Force Nl Enum Brace"
 ValueDefault=ignore
 
@@ -3263,7 +3315,7 @@ 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|nl_enum_class=not_defined
 ChoicesReadable="Ignore Nl Enum Class|Add Nl Enum Class|Remove Nl Enum Class|Force Nl Enum Class"
 ValueDefault=ignore
 
@@ -3272,7 +3324,7 @@ 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|nl_enum_class_identifier=not_defined
 ChoicesReadable="Ignore Nl Enum Class Identifier|Add Nl Enum Class Identifier|Remove Nl Enum Class Identifier|Force Nl Enum Class Identifier"
 ValueDefault=ignore
 
@@ -3281,7 +3333,7 @@ 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|nl_enum_identifier_colon=not_defined
 ChoicesReadable="Ignore Nl Enum Identifier Colon|Add Nl Enum Identifier Colon|Remove Nl Enum Identifier Colon|Force Nl Enum Identifier Colon"
 ValueDefault=ignore
 
@@ -3290,7 +3342,7 @@ Category=3
 Description="<html>Add or remove newline between 'enum class identifier :' and 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|nl_enum_colon_type=not_defined
 ChoicesReadable="Ignore Nl Enum Colon Type|Add Nl Enum Colon Type|Remove Nl Enum Colon Type|Force Nl Enum Colon Type"
 ValueDefault=ignore
 
@@ -3299,7 +3351,7 @@ 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|nl_struct_brace=not_defined
 ChoicesReadable="Ignore Nl Struct Brace|Add Nl Struct Brace|Remove Nl Struct Brace|Force Nl Struct Brace"
 ValueDefault=ignore
 
@@ -3308,7 +3360,7 @@ 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|nl_union_brace=not_defined
 ChoicesReadable="Ignore Nl Union Brace|Add Nl Union Brace|Remove Nl Union Brace|Force Nl Union Brace"
 ValueDefault=ignore
 
@@ -3317,7 +3369,7 @@ 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|nl_if_brace=not_defined
 ChoicesReadable="Ignore Nl If Brace|Add Nl If Brace|Remove Nl If Brace|Force Nl If Brace"
 ValueDefault=ignore
 
@@ -3326,7 +3378,7 @@ 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|nl_brace_else=not_defined
 ChoicesReadable="Ignore Nl Brace Else|Add Nl Brace Else|Remove Nl Brace Else|Force Nl Brace Else"
 ValueDefault=ignore
 
@@ -3335,7 +3387,7 @@ Category=3
 Description="<html>Add or remove newline between 'else if' and '{'. If set to ignore,<br/>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|nl_elseif_brace=not_defined
 ChoicesReadable="Ignore Nl Elseif Brace|Add Nl Elseif Brace|Remove Nl Elseif Brace|Force Nl Elseif Brace"
 ValueDefault=ignore
 
@@ -3344,7 +3396,7 @@ 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|nl_else_brace=not_defined
 ChoicesReadable="Ignore Nl Else Brace|Add Nl Else Brace|Remove Nl Else Brace|Force Nl Else Brace"
 ValueDefault=ignore
 
@@ -3353,7 +3405,7 @@ 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|nl_else_if=not_defined
 ChoicesReadable="Ignore Nl Else If|Add Nl Else If|Remove Nl Else If|Force Nl Else If"
 ValueDefault=ignore
 
@@ -3362,7 +3414,7 @@ Category=3
 Description="<html>Add or remove newline before '{' opening brace</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_opening_brace_func_class_def=ignore|nl_before_opening_brace_func_class_def=add|nl_before_opening_brace_func_class_def=remove|nl_before_opening_brace_func_class_def=force
+Choices=nl_before_opening_brace_func_class_def=ignore|nl_before_opening_brace_func_class_def=add|nl_before_opening_brace_func_class_def=remove|nl_before_opening_brace_func_class_def=force|nl_before_opening_brace_func_class_def=not_defined
 ChoicesReadable="Ignore Nl Before Opening Brace Func Class Def|Add Nl Before Opening Brace Func Class Def|Remove Nl Before Opening Brace Func Class Def|Force Nl Before Opening Brace Func Class Def"
 ValueDefault=ignore
 
@@ -3371,7 +3423,7 @@ 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|nl_before_if_closing_paren=not_defined
 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
 
@@ -3380,7 +3432,7 @@ 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|nl_brace_finally=not_defined
 ChoicesReadable="Ignore Nl Brace Finally|Add Nl Brace Finally|Remove Nl Brace Finally|Force Nl Brace Finally"
 ValueDefault=ignore
 
@@ -3389,7 +3441,7 @@ 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|nl_finally_brace=not_defined
 ChoicesReadable="Ignore Nl Finally Brace|Add Nl Finally Brace|Remove Nl Finally Brace|Force Nl Finally Brace"
 ValueDefault=ignore
 
@@ -3398,7 +3450,7 @@ 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|nl_try_brace=not_defined
 ChoicesReadable="Ignore Nl Try Brace|Add Nl Try Brace|Remove Nl Try Brace|Force Nl Try Brace"
 ValueDefault=ignore
 
@@ -3407,7 +3459,7 @@ 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|nl_getset_brace=not_defined
 ChoicesReadable="Ignore Nl Getset Brace|Add Nl Getset Brace|Remove Nl Getset Brace|Force Nl Getset Brace"
 ValueDefault=ignore
 
@@ -3416,7 +3468,7 @@ 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|nl_for_brace=not_defined
 ChoicesReadable="Ignore Nl For Brace|Add Nl For Brace|Remove Nl For Brace|Force Nl For Brace"
 ValueDefault=ignore
 
@@ -3425,7 +3477,7 @@ Category=3
 Description="<html>Add or remove newline before the '{' of a 'catch' statement, as in<br/>'catch (decl) &lt;here&gt; {'.</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|nl_catch_brace=not_defined
 ChoicesReadable="Ignore Nl Catch Brace|Add Nl Catch Brace|Remove Nl Catch Brace|Force Nl Catch Brace"
 ValueDefault=ignore
 
@@ -3434,7 +3486,7 @@ 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>"
 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|nl_oc_catch_brace=not_defined
 ChoicesReadable="Ignore Nl Oc Catch Brace|Add Nl Oc Catch Brace|Remove Nl Oc Catch Brace|Force Nl Oc Catch Brace"
 ValueDefault=ignore
 
@@ -3443,7 +3495,7 @@ 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|nl_brace_catch=not_defined
 ChoicesReadable="Ignore Nl Brace Catch|Add Nl Brace Catch|Remove Nl Brace Catch|Force Nl Brace Catch"
 ValueDefault=ignore
 
@@ -3452,7 +3504,7 @@ Category=3
 Description="<html>(OC) Add or remove newline between '}' and '@catch'. If set to ignore,<br/>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|nl_oc_brace_catch=not_defined
 ChoicesReadable="Ignore Nl Oc Brace Catch|Add Nl Oc Brace Catch|Remove Nl Oc Brace Catch|Force Nl Oc Brace Catch"
 ValueDefault=ignore
 
@@ -3461,7 +3513,7 @@ 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|nl_brace_square=not_defined
 ChoicesReadable="Ignore Nl Brace Square|Add Nl Brace Square|Remove Nl Brace Square|Force Nl Brace Square"
 ValueDefault=ignore
 
@@ -3470,7 +3522,7 @@ 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|nl_brace_fparen=not_defined
 ChoicesReadable="Ignore Nl Brace Fparen|Add Nl Brace Fparen|Remove Nl Brace Fparen|Force Nl Brace Fparen"
 ValueDefault=ignore
 
@@ -3479,7 +3531,7 @@ 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|nl_while_brace=not_defined
 ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
 ValueDefault=ignore
 
@@ -3488,7 +3540,7 @@ Category=3
 Description="<html>(D) Add or remove newline between 'scope (x)' and '{'.</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|nl_scope_brace=not_defined
 ChoicesReadable="Ignore Nl Scope Brace|Add Nl Scope Brace|Remove Nl Scope Brace|Force Nl Scope Brace"
 ValueDefault=ignore
 
@@ -3497,7 +3549,7 @@ Category=3
 Description="<html>(D) Add or remove newline between 'unittest' and '{'.</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|nl_unittest_brace=not_defined
 ChoicesReadable="Ignore Nl Unittest Brace|Add Nl Unittest Brace|Remove Nl Unittest Brace|Force Nl Unittest Brace"
 ValueDefault=ignore
 
@@ -3506,7 +3558,7 @@ Category=3
 Description="<html>(D) Add or remove newline between 'version (x)' and '{'.</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|nl_version_brace=not_defined
 ChoicesReadable="Ignore Nl Version Brace|Add Nl Version Brace|Remove Nl Version Brace|Force Nl Version Brace"
 ValueDefault=ignore
 
@@ -3515,7 +3567,7 @@ Category=3
 Description="<html>(C#) 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|nl_using_brace=not_defined
 ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
 ValueDefault=ignore
 
@@ -3524,7 +3576,7 @@ 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>"
 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|nl_brace_brace=not_defined
 ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
 ValueDefault=ignore
 
@@ -3533,7 +3585,7 @@ 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|nl_do_brace=not_defined
 ChoicesReadable="Ignore Nl Do Brace|Add Nl Do Brace|Remove Nl Do Brace|Force Nl Do Brace"
 ValueDefault=ignore
 
@@ -3542,7 +3594,7 @@ 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|nl_brace_while=not_defined
 ChoicesReadable="Ignore Nl Brace While|Add Nl Brace While|Remove Nl Brace While|Force Nl Brace While"
 ValueDefault=ignore
 
@@ -3551,7 +3603,7 @@ 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|nl_switch_brace=not_defined
 ChoicesReadable="Ignore Nl Switch Brace|Add Nl Switch Brace|Remove Nl Switch Brace|Force Nl Switch Brace"
 ValueDefault=ignore
 
@@ -3560,7 +3612,7 @@ 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|nl_synchronized_brace=not_defined
 ChoicesReadable="Ignore Nl Synchronized Brace|Add Nl Synchronized Brace|Remove Nl Synchronized Brace|Force Nl Synchronized Brace"
 ValueDefault=ignore
 
@@ -3577,7 +3629,7 @@ Category=3
 Description="<html>Add a newline after '(' if an if/for/while/switch condition spans multiple<br/>lines</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_multi_line_sparen_open=ignore|nl_multi_line_sparen_open=add|nl_multi_line_sparen_open=remove|nl_multi_line_sparen_open=force
+Choices=nl_multi_line_sparen_open=ignore|nl_multi_line_sparen_open=add|nl_multi_line_sparen_open=remove|nl_multi_line_sparen_open=force|nl_multi_line_sparen_open=not_defined
 ChoicesReadable="Ignore Nl Multi Line Sparen Open|Add Nl Multi Line Sparen Open|Remove Nl Multi Line Sparen Open|Force Nl Multi Line Sparen Open"
 ValueDefault=ignore
 
@@ -3586,7 +3638,7 @@ Category=3
 Description="<html>Add a newline before ')' if an if/for/while/switch condition spans multiple<br/>lines. Overrides nl_before_if_closing_paren if both are specified.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_multi_line_sparen_close=ignore|nl_multi_line_sparen_close=add|nl_multi_line_sparen_close=remove|nl_multi_line_sparen_close=force
+Choices=nl_multi_line_sparen_close=ignore|nl_multi_line_sparen_close=add|nl_multi_line_sparen_close=remove|nl_multi_line_sparen_close=force|nl_multi_line_sparen_close=not_defined
 ChoicesReadable="Ignore Nl Multi Line Sparen Close|Add Nl Multi Line Sparen Close|Remove Nl Multi Line Sparen Close|Force Nl Multi Line Sparen Close"
 ValueDefault=ignore
 
@@ -3619,7 +3671,7 @@ Category=3
 Description="<html>Add or remove newline between a case ':' and '{'.<br/><br/>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|nl_case_colon_brace=not_defined
 ChoicesReadable="Ignore Nl Case Colon Brace|Add Nl Case Colon Brace|Remove Nl Case Colon Brace|Force Nl Case Colon Brace"
 ValueDefault=ignore
 
@@ -3628,7 +3680,7 @@ 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
+Choices=nl_before_throw=ignore|nl_before_throw=add|nl_before_throw=remove|nl_before_throw=force|nl_before_throw=not_defined
 ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
 ValueDefault=ignore
 
@@ -3637,7 +3689,7 @@ Category=3
 Description="<html>Add or remove 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|nl_namespace_brace=not_defined
 ChoicesReadable="Ignore Nl Namespace Brace|Add Nl Namespace Brace|Remove Nl Namespace Brace|Force Nl Namespace Brace"
 ValueDefault=ignore
 
@@ -3646,7 +3698,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class.</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|nl_template_class=not_defined
 ChoicesReadable="Ignore Nl Template Class|Add Nl Template Class|Remove Nl Template Class|Force Nl Template Class"
 ValueDefault=ignore
 
@@ -3655,7 +3707,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class declaration.<br/><br/>Overrides nl_template_class.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_class_decl=ignore|nl_template_class_decl=add|nl_template_class_decl=remove|nl_template_class_decl=force
+Choices=nl_template_class_decl=ignore|nl_template_class_decl=add|nl_template_class_decl=remove|nl_template_class_decl=force|nl_template_class_decl=not_defined
 ChoicesReadable="Ignore Nl Template Class Decl|Add Nl Template Class Decl|Remove Nl Template Class Decl|Force Nl Template Class Decl"
 ValueDefault=ignore
 
@@ -3664,7 +3716,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class declaration.<br/><br/>Overrides nl_template_class_decl.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_class_decl_special=ignore|nl_template_class_decl_special=add|nl_template_class_decl_special=remove|nl_template_class_decl_special=force
+Choices=nl_template_class_decl_special=ignore|nl_template_class_decl_special=add|nl_template_class_decl_special=remove|nl_template_class_decl_special=force|nl_template_class_decl_special=not_defined
 ChoicesReadable="Ignore Nl Template Class Decl Special|Add Nl Template Class Decl Special|Remove Nl Template Class Decl Special|Force Nl Template Class Decl Special"
 ValueDefault=ignore
 
@@ -3673,7 +3725,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template class definition.<br/><br/>Overrides nl_template_class.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_class_def=ignore|nl_template_class_def=add|nl_template_class_def=remove|nl_template_class_def=force
+Choices=nl_template_class_def=ignore|nl_template_class_def=add|nl_template_class_def=remove|nl_template_class_def=force|nl_template_class_def=not_defined
 ChoicesReadable="Ignore Nl Template Class Def|Add Nl Template Class Def|Remove Nl Template Class Def|Force Nl Template Class Def"
 ValueDefault=ignore
 
@@ -3682,7 +3734,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized class definition.<br/><br/>Overrides nl_template_class_def.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_class_def_special=ignore|nl_template_class_def_special=add|nl_template_class_def_special=remove|nl_template_class_def_special=force
+Choices=nl_template_class_def_special=ignore|nl_template_class_def_special=add|nl_template_class_def_special=remove|nl_template_class_def_special=force|nl_template_class_def_special=not_defined
 ChoicesReadable="Ignore Nl Template Class Def Special|Add Nl Template Class Def Special|Remove Nl Template Class Def Special|Force Nl Template Class Def Special"
 ValueDefault=ignore
 
@@ -3691,7 +3743,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_func=ignore|nl_template_func=add|nl_template_func=remove|nl_template_func=force
+Choices=nl_template_func=ignore|nl_template_func=add|nl_template_func=remove|nl_template_func=force|nl_template_func=not_defined
 ChoicesReadable="Ignore Nl Template Func|Add Nl Template Func|Remove Nl Template Func|Force Nl Template Func"
 ValueDefault=ignore
 
@@ -3700,7 +3752,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>declaration.<br/><br/>Overrides nl_template_func.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_func_decl=ignore|nl_template_func_decl=add|nl_template_func_decl=remove|nl_template_func_decl=force
+Choices=nl_template_func_decl=ignore|nl_template_func_decl=add|nl_template_func_decl=remove|nl_template_func_decl=force|nl_template_func_decl=not_defined
 ChoicesReadable="Ignore Nl Template Func Decl|Add Nl Template Func Decl|Remove Nl Template Func Decl|Force Nl Template Func Decl"
 ValueDefault=ignore
 
@@ -3709,7 +3761,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>declaration.<br/><br/>Overrides nl_template_func_decl.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_func_decl_special=ignore|nl_template_func_decl_special=add|nl_template_func_decl_special=remove|nl_template_func_decl_special=force
+Choices=nl_template_func_decl_special=ignore|nl_template_func_decl_special=add|nl_template_func_decl_special=remove|nl_template_func_decl_special=force|nl_template_func_decl_special=not_defined
 ChoicesReadable="Ignore Nl Template Func Decl Special|Add Nl Template Func Decl Special|Remove Nl Template Func Decl Special|Force Nl Template Func Decl Special"
 ValueDefault=ignore
 
@@ -3718,7 +3770,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template function<br/>definition.<br/><br/>Overrides nl_template_func.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_func_def=ignore|nl_template_func_def=add|nl_template_func_def=remove|nl_template_func_def=force
+Choices=nl_template_func_def=ignore|nl_template_func_def=add|nl_template_func_def=remove|nl_template_func_def=force|nl_template_func_def=not_defined
 ChoicesReadable="Ignore Nl Template Func Def|Add Nl Template Func Def|Remove Nl Template Func Def|Force Nl Template Func Def"
 ValueDefault=ignore
 
@@ -3727,7 +3779,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;&gt;' of a specialized function<br/>definition.<br/><br/>Overrides nl_template_func_def.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_func_def_special=ignore|nl_template_func_def_special=add|nl_template_func_def_special=remove|nl_template_func_def_special=force
+Choices=nl_template_func_def_special=ignore|nl_template_func_def_special=add|nl_template_func_def_special=remove|nl_template_func_def_special=force|nl_template_func_def_special=not_defined
 ChoicesReadable="Ignore Nl Template Func Def Special|Add Nl Template Func Def Special|Remove Nl Template Func Def Special|Force Nl Template Func Def Special"
 ValueDefault=ignore
 
@@ -3736,7 +3788,7 @@ Category=3
 Description="<html>Add or remove newline after 'template&lt;...&gt;' of a template variable.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_var=ignore|nl_template_var=add|nl_template_var=remove|nl_template_var=force
+Choices=nl_template_var=ignore|nl_template_var=add|nl_template_var=remove|nl_template_var=force|nl_template_var=not_defined
 ChoicesReadable="Ignore Nl Template Var|Add Nl Template Var|Remove Nl Template Var|Force Nl Template Var"
 ValueDefault=ignore
 
@@ -3745,7 +3797,7 @@ Category=3
 Description="<html>Add or remove newline between 'template&lt;...&gt;' and 'using' of a templated<br/>type alias.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_template_using=ignore|nl_template_using=add|nl_template_using=remove|nl_template_using=force
+Choices=nl_template_using=ignore|nl_template_using=add|nl_template_using=remove|nl_template_using=force|nl_template_using=not_defined
 ChoicesReadable="Ignore Nl Template Using|Add Nl Template Using|Remove Nl Template Using|Force Nl Template Using"
 ValueDefault=ignore
 
@@ -3754,7 +3806,7 @@ 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|nl_class_brace=not_defined
 ChoicesReadable="Ignore Nl Class Brace|Add Nl Class Brace|Remove Nl Class Brace|Force Nl Class Brace"
 ValueDefault=ignore
 
@@ -3763,7 +3815,7 @@ Category=3
 Description="<html>Add or remove newline before or after (depending on pos_class_comma,<br/>may not be IGNORE) each',' in the base class list.</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|nl_class_init_args=not_defined
 ChoicesReadable="Ignore Nl Class Init Args|Add Nl Class Init Args|Remove Nl Class Init Args|Force Nl Class Init Args"
 ValueDefault=ignore
 
@@ -3772,7 +3824,7 @@ 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>"
 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|nl_constr_init_args=not_defined
 ChoicesReadable="Ignore Nl Constr Init Args|Add Nl Constr Init Args|Remove Nl Constr Init Args|Force Nl Constr Init Args"
 ValueDefault=ignore
 
@@ -3781,7 +3833,7 @@ Category=3
 Description="<html>Add or remove newline before first element, after comma, and after last<br/>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|nl_enum_own_lines=not_defined
 ChoicesReadable="Ignore Nl Enum Own Lines|Add Nl Enum Own Lines|Remove Nl Enum Own Lines|Force Nl Enum Own Lines"
 ValueDefault=ignore
 
@@ -3790,7 +3842,7 @@ Category=3
 Description="<html>Add or remove newline between return type and function name in a function<br/>definition.<br/>might be modified by nl_func_leave_one_liners</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|nl_func_type_name=not_defined
 ChoicesReadable="Ignore Nl Func Type Name|Add Nl Func Type Name|Remove Nl Func Type Name|Force Nl Func Type Name"
 ValueDefault=ignore
 
@@ -3799,7 +3851,7 @@ 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>"
 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|nl_func_type_name_class=not_defined
 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
 
@@ -3808,7 +3860,7 @@ 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>"
 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|nl_func_class_scope=not_defined
 ChoicesReadable="Ignore Nl Func Class Scope|Add Nl Func Class Scope|Remove Nl Func Class Scope|Force Nl Func Class Scope"
 ValueDefault=ignore
 
@@ -3817,7 +3869,7 @@ Category=3
 Description="<html>Add or remove newline between function scope and name, as in<br/>'void A :: &lt;here&gt; 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|nl_func_scope_name=not_defined
 ChoicesReadable="Ignore Nl Func Scope Name|Add Nl Func Scope Name|Remove Nl Func Scope Name|Force Nl Func Scope Name"
 ValueDefault=ignore
 
@@ -3826,7 +3878,7 @@ 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|nl_func_proto_type_name=not_defined
 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
 
@@ -3835,7 +3887,7 @@ Category=3
 Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>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|nl_func_paren=not_defined
 ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren"
 ValueDefault=ignore
 
@@ -3844,7 +3896,7 @@ 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|nl_func_paren_empty=not_defined
 ChoicesReadable="Ignore Nl Func Paren Empty|Add Nl Func Paren Empty|Remove Nl Func Paren Empty|Force Nl Func Paren Empty"
 ValueDefault=ignore
 
@@ -3853,7 +3905,7 @@ Category=3
 Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>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|nl_func_def_paren=not_defined
 ChoicesReadable="Ignore Nl Func Def Paren|Add Nl Func Def Paren|Remove Nl Func Def Paren|Force Nl Func Def Paren"
 ValueDefault=ignore
 
@@ -3862,7 +3914,7 @@ 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|nl_func_def_paren_empty=not_defined
 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
 
@@ -3871,7 +3923,7 @@ Category=3
 Description="<html>Add or remove newline between a function name and the opening '(' in the<br/>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|nl_func_call_paren=not_defined
 ChoicesReadable="Ignore Nl Func Call Paren|Add Nl Func Call Paren|Remove Nl Func Call Paren|Force Nl Func Call Paren"
 ValueDefault=ignore
 
@@ -3880,7 +3932,7 @@ 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|nl_func_call_paren_empty=not_defined
 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
 
@@ -3889,7 +3941,7 @@ 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|nl_func_decl_start=not_defined
 ChoicesReadable="Ignore Nl Func Decl Start|Add Nl Func Decl Start|Remove Nl Func Decl Start|Force Nl Func Decl Start"
 ValueDefault=ignore
 
@@ -3898,7 +3950,7 @@ 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|nl_func_def_start=not_defined
 ChoicesReadable="Ignore Nl Func Def Start|Add Nl Func Def Start|Remove Nl Func Def Start|Force Nl Func Def Start"
 ValueDefault=ignore
 
@@ -3907,7 +3959,7 @@ 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|nl_func_decl_start_single=not_defined
 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
 
@@ -3916,7 +3968,7 @@ 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|nl_func_def_start_single=not_defined
 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
 
@@ -3941,7 +3993,7 @@ 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|nl_func_decl_args=not_defined
 ChoicesReadable="Ignore Nl Func Decl Args|Add Nl Func Decl Args|Remove Nl Func Decl Args|Force Nl Func Decl Args"
 ValueDefault=ignore
 
@@ -3950,7 +4002,7 @@ 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|nl_func_def_args=not_defined
 ChoicesReadable="Ignore Nl Func Def Args|Add Nl Func Def Args|Remove Nl Func Def Args|Force Nl Func Def Args"
 ValueDefault=ignore
 
@@ -3959,7 +4011,7 @@ Category=3
 Description="<html>Add or remove newline after each ',' in a function call.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_call_args=ignore|nl_func_call_args=add|nl_func_call_args=remove|nl_func_call_args=force
+Choices=nl_func_call_args=ignore|nl_func_call_args=add|nl_func_call_args=remove|nl_func_call_args=force|nl_func_call_args=not_defined
 ChoicesReadable="Ignore Nl Func Call Args|Add Nl Func Call Args|Remove Nl Func Call Args|Force Nl Func Call Args"
 ValueDefault=ignore
 
@@ -3984,7 +4036,7 @@ 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|nl_func_decl_end=not_defined
 ChoicesReadable="Ignore Nl Func Decl End|Add Nl Func Decl End|Remove Nl Func Decl End|Force Nl Func Decl End"
 ValueDefault=ignore
 
@@ -3993,7 +4045,7 @@ 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|nl_func_def_end=not_defined
 ChoicesReadable="Ignore Nl Func Def End|Add Nl Func Def End|Remove Nl Func Def End|Force Nl Func Def End"
 ValueDefault=ignore
 
@@ -4002,7 +4054,7 @@ 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|nl_func_decl_end_single=not_defined
 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
 
@@ -4011,7 +4063,7 @@ 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|nl_func_def_end_single=not_defined
 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
 
@@ -4036,7 +4088,7 @@ 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|nl_func_decl_empty=not_defined
 ChoicesReadable="Ignore Nl Func Decl Empty|Add Nl Func Decl Empty|Remove Nl Func Decl Empty|Force Nl Func Decl Empty"
 ValueDefault=ignore
 
@@ -4045,7 +4097,7 @@ 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|nl_func_def_empty=not_defined
 ChoicesReadable="Ignore Nl Func Def Empty|Add Nl Func Def Empty|Remove Nl Func Def Empty|Force Nl Func Def Empty"
 ValueDefault=ignore
 
@@ -4054,7 +4106,7 @@ 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|nl_func_call_empty=not_defined
 ChoicesReadable="Ignore Nl Func Call Empty|Add Nl Func Call Empty|Remove Nl Func Call Empty|Force Nl Func Call Empty"
 ValueDefault=ignore
 
@@ -4063,7 +4115,7 @@ Category=3
 Description="<html>Whether to add a newline after '(' in a function call,<br/>has preference over nl_func_call_start_multi_line.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_call_start=ignore|nl_func_call_start=add|nl_func_call_start=remove|nl_func_call_start=force
+Choices=nl_func_call_start=ignore|nl_func_call_start=add|nl_func_call_start=remove|nl_func_call_start=force|nl_func_call_start=not_defined
 ChoicesReadable="Ignore Nl Func Call Start|Add Nl Func Call Start|Remove Nl Func Call Start|Force Nl Func Call Start"
 ValueDefault=ignore
 
@@ -4072,7 +4124,7 @@ Category=3
 Description="<html>Whether to add a newline before ')' in a function call.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_func_call_end=ignore|nl_func_call_end=add|nl_func_call_end=remove|nl_func_call_end=force
+Choices=nl_func_call_end=ignore|nl_func_call_end=add|nl_func_call_end=remove|nl_func_call_end=force|nl_func_call_end=not_defined
 ChoicesReadable="Ignore Nl Func Call End|Add Nl Func Call End|Remove Nl Func Call End|Force Nl Func Call End"
 ValueDefault=ignore
 
@@ -4102,7 +4154,7 @@ ValueDefault=false
 
 [Nl Func Call Args Multi Line Ignore Closures]
 Category=3
-Description="<html>Whether to respect nl_func_call_XXX option incase of closure args.</html>"
+Description="<html>Whether to respect nl_func_call_XXX option in case of closure args.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_func_call_args_multi_line_ignore_closures=true|nl_func_call_args_multi_line_ignore_closures=false
@@ -4145,7 +4197,7 @@ 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|nl_fdef_brace=not_defined
 ChoicesReadable="Ignore Nl Fdef Brace|Add Nl Fdef Brace|Remove Nl Fdef Brace|Force Nl Fdef Brace"
 ValueDefault=ignore
 
@@ -4154,7 +4206,7 @@ Category=3
 Description="<html>Add or remove newline between function signature and '{',<br/>if signature ends with ')'. Overrides nl_fdef_brace.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_fdef_brace_cond=ignore|nl_fdef_brace_cond=add|nl_fdef_brace_cond=remove|nl_fdef_brace_cond=force
+Choices=nl_fdef_brace_cond=ignore|nl_fdef_brace_cond=add|nl_fdef_brace_cond=remove|nl_fdef_brace_cond=force|nl_fdef_brace_cond=not_defined
 ChoicesReadable="Ignore Nl Fdef Brace Cond|Add Nl Fdef Brace Cond|Remove Nl Fdef Brace Cond|Force Nl Fdef Brace Cond"
 ValueDefault=ignore
 
@@ -4163,7 +4215,7 @@ 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|nl_cpp_ldef_brace=not_defined
 ChoicesReadable="Ignore Nl Cpp Ldef Brace|Add Nl Cpp Ldef Brace|Remove Nl Cpp Ldef Brace|Force Nl Cpp Ldef Brace"
 ValueDefault=ignore
 
@@ -4172,7 +4224,7 @@ Category=3
 Description="<html>Add or remove newline between 'return' and the 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|nl_return_expr=not_defined
 ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
 ValueDefault=ignore
 
@@ -4189,7 +4241,7 @@ Category=3
 Description="<html>(Java) Add or remove newline between the ')' and '{{' of the double brace<br/>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|nl_paren_dbrace_open=not_defined
 ChoicesReadable="Ignore Nl Paren Dbrace Open|Add Nl Paren Dbrace Open|Remove Nl Paren Dbrace Open|Force Nl Paren Dbrace Open"
 ValueDefault=ignore
 
@@ -4198,7 +4250,7 @@ Category=3
 Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>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|nl_type_brace_init_lst=not_defined
 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
 
@@ -4207,7 +4259,7 @@ Category=3
 Description="<html>Whether to add a newline after the open brace in an unnamed temporary<br/>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|nl_type_brace_init_lst_open=not_defined
 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
 
@@ -4216,7 +4268,7 @@ Category=3
 Description="<html>Whether to add a newline before the close brace in an unnamed temporary<br/>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|nl_type_brace_init_lst_close=not_defined
 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
 
@@ -4273,7 +4325,7 @@ 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>"
 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|nl_brace_struct_var=not_defined
 ChoicesReadable="Ignore Nl Brace Struct Var|Add Nl Brace Struct Var|Remove Nl Brace Struct Var|Force Nl Brace Struct Var"
 ValueDefault=ignore
 
@@ -4314,7 +4366,7 @@ 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|nl_before_if=not_defined
 ChoicesReadable="Ignore Nl Before If|Add Nl Before If|Remove Nl Before If|Force Nl Before If"
 ValueDefault=ignore
 
@@ -4323,7 +4375,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force
+Choices=nl_after_if=ignore|nl_after_if=add|nl_after_if=remove|nl_after_if=force|nl_after_if=not_defined
 ChoicesReadable="Ignore Nl After If|Add Nl After If|Remove Nl After If|Force Nl After If"
 ValueDefault=ignore
 
@@ -4332,7 +4384,7 @@ 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|nl_before_for=not_defined
 ChoicesReadable="Ignore Nl Before For|Add Nl Before For|Remove Nl Before For|Force Nl Before For"
 ValueDefault=ignore
 
@@ -4341,7 +4393,7 @@ 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|nl_after_for=not_defined
 ChoicesReadable="Ignore Nl After For|Add Nl After For|Remove Nl After For|Force Nl After For"
 ValueDefault=ignore
 
@@ -4350,7 +4402,7 @@ 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|nl_before_while=not_defined
 ChoicesReadable="Ignore Nl Before While|Add Nl Before While|Remove Nl Before While|Force Nl Before While"
 ValueDefault=ignore
 
@@ -4359,7 +4411,7 @@ 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|nl_after_while=not_defined
 ChoicesReadable="Ignore Nl After While|Add Nl After While|Remove Nl After While|Force Nl After While"
 ValueDefault=ignore
 
@@ -4368,7 +4420,7 @@ 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|nl_before_switch=not_defined
 ChoicesReadable="Ignore Nl Before Switch|Add Nl Before Switch|Remove Nl Before Switch|Force Nl Before Switch"
 ValueDefault=ignore
 
@@ -4377,7 +4429,7 @@ 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|nl_after_switch=not_defined
 ChoicesReadable="Ignore Nl After Switch|Add Nl After Switch|Remove Nl After Switch|Force Nl After Switch"
 ValueDefault=ignore
 
@@ -4386,7 +4438,7 @@ 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|nl_before_synchronized=not_defined
 ChoicesReadable="Ignore Nl Before Synchronized|Add Nl Before Synchronized|Remove Nl Before Synchronized|Force Nl Before Synchronized"
 ValueDefault=ignore
 
@@ -4395,7 +4447,7 @@ 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|nl_after_synchronized=not_defined
 ChoicesReadable="Ignore Nl After Synchronized|Add Nl After Synchronized|Remove Nl After Synchronized|Force Nl After Synchronized"
 ValueDefault=ignore
 
@@ -4404,7 +4456,7 @@ 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|nl_before_do=not_defined
 ChoicesReadable="Ignore Nl Before Do|Add Nl Before Do|Remove Nl Before Do|Force Nl Before Do"
 ValueDefault=ignore
 
@@ -4413,7 +4465,7 @@ 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|nl_after_do=not_defined
 ChoicesReadable="Ignore Nl After Do|Add Nl After Do|Remove Nl After Do|Force Nl After Do"
 ValueDefault=ignore
 
@@ -4438,7 +4490,7 @@ Category=3
 Description="<html>Whether to put a blank line before a member '.' or '-&gt;' operators.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_before_member=ignore|nl_before_member=add|nl_before_member=remove|nl_before_member=force
+Choices=nl_before_member=ignore|nl_before_member=add|nl_before_member=remove|nl_before_member=force|nl_before_member=not_defined
 ChoicesReadable="Ignore Nl Before Member|Add Nl Before Member|Remove Nl Before Member|Force Nl Before Member"
 ValueDefault=ignore
 
@@ -4447,7 +4499,7 @@ Category=3
 Description="<html>(Java) Whether to put a blank line after a member '.' or '-&gt;' operators.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_after_member=ignore|nl_after_member=add|nl_after_member=remove|nl_after_member=force
+Choices=nl_after_member=ignore|nl_after_member=add|nl_after_member=remove|nl_after_member=force|nl_after_member=not_defined
 ChoicesReadable="Ignore Nl After Member|Add Nl After Member|Remove Nl After Member|Force Nl After Member"
 ValueDefault=ignore
 
@@ -4472,7 +4524,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force
+Choices=nl_class_colon=ignore|nl_class_colon=add|nl_class_colon=remove|nl_class_colon=force|nl_class_colon=not_defined
 ChoicesReadable="Ignore Nl Class Colon|Add Nl Class Colon|Remove Nl Class Colon|Force Nl Class Colon"
 ValueDefault=ignore
 
@@ -4481,7 +4533,7 @@ 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>"
 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|nl_constr_colon=not_defined
 ChoicesReadable="Ignore Nl Constr Colon|Add Nl Constr Colon|Remove Nl Constr Colon|Force Nl Constr Colon"
 ValueDefault=ignore
 
@@ -4527,7 +4579,7 @@ ValueDefault=false
 
 [Nl Create List 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>Whether to split one-line simple unbraced if statements into three lines by<br/>adding newlines, as in 'int a[12] = { &lt;here&gt; 0 &lt;here&gt; };'.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=nl_create_list_one_liner=true|nl_create_list_one_liner=false
@@ -4587,7 +4639,7 @@ ValueDefault=0
 
 [Nl Inside Empty Func]
 Category=4
-Description="<html>The number of newlines inside an empty function body.<br/>This option is overridden by nl_collapse_empty_body=true</html>"
+Description="<html>The number of newlines inside an empty function body.<br/>This option overrides eat_blanks_after_open_brace and<br/>eat_blanks_before_close_brace, but is ignored when<br/>nl_collapse_empty_body=true</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_inside_empty_func="
@@ -4607,7 +4659,7 @@ ValueDefault=0
 
 [Nl Before Func Body Def]
 Category=4
-Description="<html>The number of newlines before a multi-line function definition.</html>"
+Description="<html>The number of newlines before a multi-line function definition. Where<br/>applicable, this option is overridden with eat_blanks_after_open_brace=true</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_before_func_body_def="
@@ -4954,7 +5006,7 @@ Category=4
 Description="<html>(C#) Add or remove newline between 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|nl_property_brace=not_defined
 ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
 ValueDefault=ignore
 
@@ -4989,7 +5041,7 @@ Category=4
 Description="<html>(Java) Add or remove newline after an annotation statement. Only affects<br/>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|nl_after_annotation=not_defined
 ChoicesReadable="Ignore Nl After Annotation|Add Nl After Annotation|Remove Nl After Annotation|Force Nl After Annotation"
 ValueDefault=ignore
 
@@ -4998,7 +5050,7 @@ Category=4
 Description="<html>(Java) Add or remove 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|nl_between_annotation=not_defined
 ChoicesReadable="Ignore Nl Between Annotation|Add Nl Between Annotation|Remove Nl Between Annotation|Force Nl Between Annotation"
 ValueDefault=ignore
 
@@ -5818,7 +5870,7 @@ ValueDefault=0
 
 [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>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 (enable cmt_indent_multi for indent with line wrapping due to cmt_width)</html>"
 Enabled=false
 EditorType=numeric
 CallName="cmt_reflow_mode="
@@ -5826,6 +5878,22 @@ MinVal=0
 MaxVal=2
 ValueDefault=0
 
+[Cmt Reflow Fold Regex File]
+Category=8
+Description="<html>Path to a file that contains regular expressions describing patterns for<br/>which the end of one line and the beginning of the next will be folded into<br/>the same sentence or paragraph during full comment reflow. The regular<br/>expressions are described using ECMAScript syntax. The syntax for this<br/>specification is as follows, where "..." indicates the custom regular<br/>expression and "n" indicates the nth end_of_prev_line_regex and<br/>beg_of_next_line_regex regular expression pair:<br/><br/>end_of_prev_line_regex[1] = "...$"<br/>beg_of_next_line_regex[1] = "^..."<br/>end_of_prev_line_regex[2] = "...$"<br/>beg_of_next_line_regex[2] = "^..."<br/>            .<br/>            .<br/>            .<br/>end_of_prev_line_regex[n] = "...$"<br/>beg_of_next_line_regex[n] = "^..."<br/><br/>Note that use of this option overrides the default reflow fold regular<br/>expressions, which are internally defined as follows:<br/><br/>end_of_prev_line_regex[1] = "[\w,\]\)]$"<br/>beg_of_next_line_regex[1] = "^[\w,\[\(]"<br/>end_of_prev_line_regex[2] = "\.$"<br/>beg_of_next_line_regex[2] = "^[A-Z]"</html>"
+Enabled=false
+CallName=cmt_reflow_fold_regex_file=
+EditorType=string
+ValueDefault=
+
+[Cmt Reflow Indent To Paragraph Start]
+Category=8
+Description="<html>Whether to indent wrapped lines to the start of the encompassing paragraph<br/>during full comment reflow (cmt_reflow_mode = 2). Overrides the value<br/>specified by cmt_sp_after_star_cont.<br/><br/>Note that cmt_align_doxygen_javadoc_tags overrides this option for<br/>paragraphs associated with javadoc tags</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_reflow_indent_to_paragraph_start=true|cmt_reflow_indent_to_paragraph_start=false
+ValueDefault=false
+
 [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>"
@@ -5842,6 +5910,24 @@ EditorType=boolean
 TrueFalse=cmt_indent_multi=true|cmt_indent_multi=false
 ValueDefault=true
 
+[Cmt Align Doxygen Javadoc Tags]
+Category=8
+Description="<html>Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)<br/>and corresponding fields such that groups of consecutive block tags,<br/>parameter names, and descriptions align with one another. Overrides that<br/>which is specified by the cmt_sp_after_star_cont. If cmt_width &gt; 0, it may<br/>be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2<br/>in order to achieve the desired alignment for line-wrapping.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=cmt_align_doxygen_javadoc_tags=true|cmt_align_doxygen_javadoc_tags=false
+ValueDefault=false
+
+[Cmt Sp Before Doxygen Javadoc Tags]
+Category=8
+Description="<html>The number of spaces to insert after the star and before doxygen<br/>javadoc-style tags (@param, @return, etc). Requires enabling<br/>cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the<br/>cmt_sp_after_star_cont.<br/><br/>Default: 1</html>"
+Enabled=false
+EditorType=numeric
+CallName="cmt_sp_before_doxygen_javadoc_tags="
+MinVal=0
+MaxVal=16
+ValueDefault=1
+
 [Cmt C Group]
 Category=8
 Description="<html>Whether to group c-comments that look like they are in a block.</html>"
@@ -6013,7 +6099,7 @@ Category=9
 Description="<html>Add or remove braces on a 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|mod_full_brace_do=not_defined
 ChoicesReadable="Ignore Mod Full Brace Do|Add Mod Full Brace Do|Remove Mod Full Brace Do|Force Mod Full Brace Do"
 ValueDefault=ignore
 
@@ -6022,7 +6108,7 @@ Category=9
 Description="<html>Add or remove braces on a 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|mod_full_brace_for=not_defined
 ChoicesReadable="Ignore Mod Full Brace For|Add Mod Full Brace For|Remove Mod Full Brace For|Force Mod Full Brace For"
 ValueDefault=ignore
 
@@ -6031,7 +6117,7 @@ Category=9
 Description="<html>(Pawn) Add or remove braces on a single-line function definition.</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|mod_full_brace_function=not_defined
 ChoicesReadable="Ignore Mod Full Brace Function|Add Mod Full Brace Function|Remove Mod Full Brace Function|Force Mod Full Brace Function"
 ValueDefault=ignore
 
@@ -6040,7 +6126,7 @@ 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>"
 Enabled=false
 EditorType=multiple
-Choices=mod_full_brace_if=ignore|mod_full_brace_if=add|mod_full_brace_if=remove|mod_full_brace_if=force
+Choices=mod_full_brace_if=ignore|mod_full_brace_if=add|mod_full_brace_if=remove|mod_full_brace_if=force|mod_full_brace_if=not_defined
 ChoicesReadable="Ignore Mod Full Brace If|Add Mod Full Brace If|Remove Mod Full Brace If|Force Mod Full Brace If"
 ValueDefault=ignore
 
@@ -6065,7 +6151,7 @@ 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
+Choices=mod_full_brace_while=ignore|mod_full_brace_while=add|mod_full_brace_while=remove|mod_full_brace_while=force|mod_full_brace_while=not_defined
 ChoicesReadable="Ignore Mod Full Brace While|Add Mod Full Brace While|Remove Mod Full Brace While|Force Mod Full Brace While"
 ValueDefault=ignore
 
@@ -6074,7 +6160,7 @@ 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
+Choices=mod_full_brace_using=ignore|mod_full_brace_using=add|mod_full_brace_using=remove|mod_full_brace_using=force|mod_full_brace_using=not_defined
 ChoicesReadable="Ignore Mod Full Brace Using|Add Mod Full Brace Using|Remove Mod Full Brace Using|Force Mod Full Brace Using"
 ValueDefault=ignore
 
@@ -6101,7 +6187,7 @@ Category=9
 Description="<html>Add or remove unnecessary parenthesis 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|mod_paren_on_return=not_defined
 ChoicesReadable="Ignore Mod Paren On Return|Add Mod Paren On Return|Remove Mod Paren On Return|Force Mod Paren On Return"
 ValueDefault=ignore
 
@@ -6274,7 +6360,7 @@ 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>"
 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|mod_case_brace=not_defined
 ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
 ValueDefault=ignore
 
@@ -6291,7 +6377,7 @@ 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
+Choices=mod_enum_last_comma=ignore|mod_enum_last_comma=add|mod_enum_last_comma=remove|mod_enum_last_comma=force|mod_enum_last_comma=not_defined
 ChoicesReadable="Ignore Mod Enum Last Comma|Add Mod Enum Last Comma|Remove Mod Enum Last Comma|Force Mod Enum Last Comma"
 ValueDefault=ignore
 
@@ -6378,7 +6464,7 @@ Category=10
 Description="<html>Add or remove indentation of preprocessor directives inside #if blocks<br/>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|pp_indent=not_defined
 ChoicesReadable="Ignore Pp Indent|Add Pp Indent|Remove Pp Indent|Force Pp Indent"
 ValueDefault=ignore
 
@@ -6405,7 +6491,7 @@ Category=10
 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|pp_space=not_defined
 ChoicesReadable="Ignore Pp Space|Add Pp Space|Remove Pp Space|Force Pp Space"
 ValueDefault=ignore
 
@@ -6569,7 +6655,7 @@ ValueDefault=true
 
 [Use Form Feed No More As Whitespace Character]
 Category=12
-Description="<html>If true: the form feed character is removed from the list<br/>of whitespace characters.<br/>See https://en.cppreference.com/w/cpp/string/byte/isspace</html>"
+Description="<html>If true: the form feed character is removed from the list of whitespace<br/>characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=use_form_feed_no_more_as_whitespace_character=true|use_form_feed_no_more_as_whitespace_character=false
@@ -6614,3 +6700,13 @@ CallName="debug_timeout="
 MinVal=
 MaxVal=
 ValueDefault=0
+
+[Debug Truncate]
+Category=13
+Description="<html>Set the number of characters to be printed if the text is too long,<br/>0: do not truncate.</html>"
+Enabled=false
+EditorType=numeric
+CallName="debug_truncate="
+MinVal=0
+MaxVal=960
+ValueDefault=0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/unmatched_close_pp.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/unmatched_close_pp.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/unmatched_close_pp.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/unmatched_close_pp.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/v-out.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/v-out.txt
index 129af768..129af768 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/v-out.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/v-out.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/xyz-err.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/xyz-err.txt
index a16550ed..a16550ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/output/xyz-err.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/output/xyz-err.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/test_cli_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/test_cli_options.py
index a3ceafa7..d835822e 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cli/test_cli_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cli/test_cli_options.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 """
 test_cli_options.py
@@ -6,16 +6,16 @@ test_cli_options.py
 Tests output generated by Uncrustifys commandline options
 (excluding actual source code formatting)
 
-:author:  Daniel Chumak
+:author:  DanielChumak
 :license: GPL v2+
 """
 
 from __future__ import print_function
-from sys import stderr, argv, exit as sys_exit, version_info as py_version_info
+from sys import stderr, argv, exit as sys_exit
 from os import mkdir, remove, name as os_name
 from os.path import dirname, relpath, isdir, isfile, join as path_join, split as path_split
 from shutil import rmtree, copyfile
-from subprocess import Popen, PIPE, STDOUT
+from subprocess import Popen, PIPE
 from io import open
 import re
 import difflib
@@ -32,13 +32,13 @@ else:
     NULL_DEVICE = '/dev/null'
 
 RE_CALLSTACK = r'\[CallStack:( \w+:\w+(, \w+:\w+)*|-DEBUG NOT SET-)?\]'
-RE_DO_SPACE = (r'\n\ndo_space : WARNING: unrecognize do_space:'
+RE_DO_SPACE = (r'\n\ndo_space : WARNING: unrecognized do_space:'
                r'\n[^\n]+\n[^\n]+\n')
 
 
 def eprint(*args, **kwargs):
     """
-        print() wraper that sets file=stderr
+        print() wrapper that sets file=stderr
     """
     print(*args, file=stderr, **kwargs)
 
@@ -185,8 +185,8 @@ def check_generated_output(gen_expected_path, gen_result_path,
             f.write(gen_res_txt)
 
         if program_args.apply and program_args.auto_output_path:
-                write_to_output_path(program_args.auto_output_path, gen_res_txt)
-                return True
+            write_to_output_path(program_args.auto_output_path, gen_res_txt)
+            return True
         elif program_args.diff:
             print("\n************************************")
             print("Problem (1) with %s" % gen_result_path)
@@ -200,7 +200,7 @@ def check_generated_output(gen_expected_path, gen_result_path,
 
             return False
         else:
-            print("\nProblem (1) with %s" % gen_result_path)
+            print("\nProblem (2) with %s" % gen_result_path)
             print("use(gen): '--diff' to find out why %s %s are different"
                   % (gen_result_path, gen_expected_path))
             return False
@@ -260,7 +260,8 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None,
 
         if program_args.diff:
             print("\n************************************")
-            print("Problem (2) with %s" % result_path)
+            print("Problem (3) with result_path   is %s" % result_path)
+            print("                 expected_path is %s" % expected_path)
             print("************************************")
 
             file_diff = difflib.ndiff(result_str.splitlines(False),
@@ -273,7 +274,7 @@ def check_std_output(expected_path, result_path, result_str, result_manip=None,
             for line in file_diff:
                 pprint.PrettyPrinter(indent=4, width=280).pprint(line)
         else:
-            print("\nProblem (2) with %s" % result_path)
+            print("\nProblem (4) with %s" % result_path)
             print("use: '--diff' to find out why %s %s are different"
                   % (result_path, expected_path))
         return False
@@ -290,7 +291,7 @@ def check_uncrustify_output(
     """
     compares outputs generated by Uncrustify with files
 
-    Paramerters
+    Parameters
     ----------------------------------------------------------------------------
     :param uncr_bin: string
         path to the Uncrustify binary
@@ -475,6 +476,9 @@ def main(args):
     parser.add_argument('--build',
                         default=s_path_join(script_dir, '../../build'),
                         help='specify location of the build directory')
+    parser.add_argument('--config',
+                        default='Release',
+                        help='the build_type value (Release or Debug)')
 
     parsed_args = parser.parse_args()
 
@@ -561,6 +565,23 @@ def main(args):
         return_flag = False
 
     #
+    # Test the truncate option
+    #
+    if not check_uncrustify_output(
+            uncr_bin,
+            parsed_args,
+            args_arr=['-c', s_path_join(script_dir, 'config/truncate.cfg'),
+                      '-f', s_path_join(script_dir, 'input/truncate.cpp'),
+                      '-o', NULL_DEVICE,
+                      '-L', '83'],
+            err_expected_path=s_path_join(script_dir, 'output/truncate.txt'),
+            err_result_path=s_path_join(script_dir, 'results/truncate.txt'),
+            err_result_manip=[reg_replace(r'\([0-9]+\)', ' '),
+                              reg_replace(RE_DO_SPACE, '')]
+            ):
+        return_flag = False
+
+    #
     # Test --update-config
     #
     if not check_uncrustify_output(
@@ -637,11 +658,19 @@ def main(args):
                 gen_result_manip=reg_replace(r'\# Uncrustify.+[^\n\r]', '')
                 ):
             return_flag = False
-            
-    #
-    # Test -p and -c with '-' input
-    #
-    if os_name != 'nt' and not check_uncrustify_output(
+
+        if not check_uncrustify_output(
+                uncr_bin,
+                parsed_args,
+                args_arr=['-f', s_path_join(script_dir, 'input/class_enum_struct_union.cpp'),
+                          '-p', s_path_join(script_dir, 'results/class_enum_struct_union.txt')],
+                gen_expected_path=s_path_join(script_dir, 'output/class_enum_struct_union.txt'),
+                gen_result_path=s_path_join(script_dir, 'results/class_enum_struct_union.txt'),
+                gen_result_manip=reg_replace(r'\# Uncrustify.+[^\n\r]', '')
+                ):
+            return_flag = False
+
+    if os_name == 'nt' or check_uncrustify_output(
             uncr_bin,
             parsed_args,
             args_arr=['-c', '-',
@@ -650,7 +679,12 @@ def main(args):
             out_expected_path=s_path_join(script_dir, 'output/pc-.txt'),
             out_result_manip=reg_replace(r'\# Uncrustify.+[^\n\r]', ''),
             out_result_path=s_path_join(script_dir, 'results/pc-.txt')
-            ):
+    ):
+        pass
+    #
+    # Test -p and -c with '-' input
+    #
+    else:
         return_flag = False
 
     #
@@ -669,6 +703,34 @@ def main(args):
         return_flag = False
 
     #
+    # Test --tracking_space FILE
+    #
+    if parsed_args.config == 'Release':
+        eprint("Release")
+        if not check_uncrustify_output(
+                uncr_bin,
+                parsed_args,
+                args_arr=['-c', s_path_join(script_dir, 'config/tracking_space.cfg'),
+                          '-f', s_path_join(script_dir, 'input/tracking_space.cpp'),
+                          '--tracking_space', s_path_join(script_dir, 'results/tracking_space.html')],
+                gen_expected_path=s_path_join(script_dir, 'output/tracking_space.html'),
+                gen_result_path=s_path_join(script_dir, 'results/tracking_space.html'),
+                ):
+            return_flag = False
+    else:
+        eprint("Debug")
+        if not check_uncrustify_output(
+                uncr_bin,
+                parsed_args,
+                args_arr=['-c', s_path_join(script_dir, 'config/tracking_space.cfg'),
+                          '-f', s_path_join(script_dir, 'input/tracking_space.cpp'),
+                          '--tracking_space', s_path_join(script_dir, 'results/tracking_space.html')],
+                gen_expected_path=s_path_join(script_dir, 'output/Debug_tracking_space.html'),
+                gen_result_path=s_path_join(script_dir, 'results/tracking_space.html'),
+                ):
+            return_flag = False
+
+    #
     # Test --replace
     #
     copyfile("input/backup.h-save", "input/backup.h")
@@ -710,8 +772,6 @@ def main(args):
     #   -L
     # look at src/log_levels.h
     Ls_A = ['9', '21', '25', '28', '31', '36', '66', '92']
-    #Ls_A = ['9', '21', '25', '28', '31', '36', '92']
-    #Ls_A = ['66']
     for L in Ls_A:
         if not check_uncrustify_output(
                 uncr_bin,
@@ -721,11 +781,13 @@ def main(args):
                 err_expected_path=s_path_join(script_dir, 'output/%s.txt' % L),
                 err_result_path=s_path_join(script_dir, 'results/%s.txt' % L),
                 err_result_manip=[reg_replace(r'\([0-9]+\)', ' '),
+                                  reg_replace(r'\:[0-9]+\)', ' '),
                                   reg_replace(r'\[line [0-9]+', '[ '),
                                   reg_replace(r'   \[[_|,|1|A-Z]*\]', '   []'),
                                   reg_replace(r', \[[_|,|1|A-Z]*\]', ', []'),
                                   reg_replace(r', \[0[xX][0-9a-fA-F]+:[_|,|1|A-Z]*\]', ', []'),
                                   reg_replace(r'   \[0[xX][0-9a-fA-F]+:[_|,|1|A-Z]*\]', '   []'),
+                                  reg_replace(r'^[ \t]*[_A-Za-z][_A-Za-z0-9]*::', ''),
                                   reg_replace(RE_CALLSTACK, '[CallStack]'),
                                   reg_replace(RE_DO_SPACE, '')]
             ):
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1225.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1225.cfg
index cbc83adb..cbc83adb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1225.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1225.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1438.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1438.cfg
index 6973c22f..6973c22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1438.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1438.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1927.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1927.cfg
index 3734f63d..3734f63d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1927.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1927.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1liner-no-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-no-split.cfg
index 84eba64d..84eba64d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1liner-no-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-no-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1liner-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-split.cfg
index e666ea24..e666ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/1liner-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/1liner-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/2185.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2185.cfg
index fda2290c..fda2290c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/2185.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2185.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/2203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2203.cfg
index e9c359cf..e9c359cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/2203.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/2203.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/615_nested_usings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/615_nested_usings.cfg
index ae152fd4..ae152fd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/615_nested_usings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/615_nested_usings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/620_getset-brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/620_getset-brace.cfg
index 8e5510d0..8e5510d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/620_getset-brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/620_getset-brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/623_caret-spacing.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/623_caret-spacing.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/623_caret-spacing.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/623_caret-spacing.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/625_where-constraints.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/625_where-constraints.cfg
index a6fa8175..a6fa8175 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/625_where-constraints.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/625_where-constraints.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/633_decl-in-func-typedef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/633_decl-in-func-typedef.cfg
index 5ca47821..5ca47821 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/633_decl-in-func-typedef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/633_decl-in-func-typedef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/DefaultAndDelete-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-0.cfg
index 8aef4713..8aef4713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/DefaultAndDelete-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/DefaultAndDelete-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-1.cfg
index f97e0abe..f97e0abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/DefaultAndDelete-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/DefaultAndDelete-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-2.cfg
index 6c39bace..6c39bace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/DefaultAndDelete-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/DefaultAndDelete-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/I1112-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I1112-2.cfg
index 6b1bba41..6b1bba41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/I1112-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I1112-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/I2103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I2103.cfg
index 5c34ca18..5c34ca18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/I2103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/I2103.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue-2278.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue-2278.cfg
index 80ba4f6f..80ba4f6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue-2278.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue-2278.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1052.cfg
index 91fe8899..91fe8899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1122.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1122.cfg
index 8a152eda..8a152eda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1122.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1122.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1124-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-f.cfg
index bec692b6..bec692b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1124-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1124-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-r.cfg
index 1c610373..1c610373 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1124-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1124-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1167.cfg
index feb56c83..feb56c83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1184.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1184.cfg
index 0fdd95de..0fdd95de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1184.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1184.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1460.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1460.cfg
index 7adee60a..7adee60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1460.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1460.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1511.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1511.cfg
index 71c01f4d..71c01f4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1511.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1511.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1692.cfg
index db3cbdbe..db3cbdbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1692.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1703.cfg
index f8c889ab..f8c889ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1703.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1703.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1734.cfg
index 37a4c192..37a4c192 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1753.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1753.cfg
index e0e5ab0b..e0e5ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1753.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1753.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1813.cfg
index ff1ce9d3..ff1ce9d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1813.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1813.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1845.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1845.cfg
index 5d339f68..5d339f68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1845.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1845.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1923.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1923.cfg
index f242e902..f242e902 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1923.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1923.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1966.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1966.cfg
index be3a873d..be3a873d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_1966.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_1966.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2020.cfg
index 2104e036..2104e036 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2045.cfg
index 3fb7cfe9..3fb7cfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2045.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2045.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2085.cfg
index 2df8ebd8..2df8ebd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2085.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2085.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2090.cfg
index f6e8529b..f6e8529b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2090.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2090.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2091.cfg
index 898b035b..898b035b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2101.cfg
index 44e5a0e6..44e5a0e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2149.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2149.cfg
index 23a8583a..23a8583a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2149.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2149.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2150.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2150.cfg
index 5f518291..5f518291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2150.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2150.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2151.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2151.cfg
index 0660e498..0660e498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2151.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2151.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2163.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2163.cfg
index b7c31fe2..b7c31fe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2163.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2163.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2166.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2166.cfg
index 2b473436..2b473436 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2166.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2166.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2170.cfg
index f66f0022..f66f0022 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2172.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2172.cfg
index a4da88d2..a4da88d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2172.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2172.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2186.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2186.cfg
index d694b699..d694b699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2186.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2186.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2195.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2195.cfg
index 0c70840d..0c70840d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2195.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2195.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2219.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2219.cfg
index 865142a1..865142a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2219.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2219.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2224.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2224.cfg
index 8973a14f..8973a14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2224.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2224.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2229.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2229.cfg
index 8527cbb2..8527cbb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2229.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2229.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2232.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2232.cfg
index 06730341..06730341 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2232.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2232.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2236.cfg
index 6d30f256..6d30f256 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2236.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2250.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2250.cfg
index 94a8d306..94a8d306 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2250.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2250.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2270.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2270.cfg
index 43cc3757..43cc3757 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2270.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2270.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2279.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2279.cfg
index 1f646668..1f646668 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2279.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2279.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2281.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2281.cfg
index 1d8b164e..1d8b164e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2281.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2281.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2302.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2302.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2302.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2302.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2305.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2305.cfg
index 7200d9ac..7200d9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2305.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2305.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2319.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2319.cfg
index aeb132b5..aeb132b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2319.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2319.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2343.cfg
index 955a1f9a..955a1f9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2345.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2345.cfg
index 27213b45..27213b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2345.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2345.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2360-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-a.cfg
index 85052020..85052020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2360-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2360-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-b.cfg
index b61841cc..b61841cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2360-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2360-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2368.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2368.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2368.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2368.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2383.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2383.cfg
index 313d9efb..313d9efb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2383.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2383.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2386.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2386.cfg
index 3a121c2e..3a121c2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2386.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2386.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2411.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2411.cfg
index a4770ec9..a4770ec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2411.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2411.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2428.cfg
index 8af28414..8af28414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2428.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2428.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2437.cfg
index b21679ce..b21679ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2437.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2440.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2440.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2440_nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440_nl.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2440_nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2440_nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2478.cfg
index bb4425d9..bb4425d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2561.cfg
index 03a40504..03a40504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2561.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2561.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2570.cfg
index 6a9f2d25..6a9f2d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2570.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2570.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2574.cfg
index d96f0980..d96f0980 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2582.cfg
index f634b12e..f634b12e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2582.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2582.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2586.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2586.cfg
index ff46f80d..ff46f80d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2586.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2586.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2591.cf b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cf
index b93c5f06..b93c5f06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2591.cf
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cf
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2591.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cfg
index 6ca8934c..6ca8934c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2591.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2591.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2594.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2594.cfg
index 6d847dfc..6d847dfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2594.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2594.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2596.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2596.cfg
index b6338859..b6338859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2596.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2596.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2604.cfg
index daeb9bc6..daeb9bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2604.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2604.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2640.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2640.cfg
index a4dd2354..a4dd2354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2640.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2640.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2668.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2668.cfg
index 7649b34c..7649b34c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2668.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2668.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2688.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2688.cfg
new file mode 100644
index 00000000..4baf4b3f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2688.cfg
@@ -0,0 +1,5 @@
+sp_arith         = true
+sp_bool          = true
+sp_compare       = true
+indent_columns   = 2
+indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2689.cfg
index e498e830..e498e830 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2692.cfg
index bce2060e..bce2060e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2692.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2703.cfg
index 80c42da9..80c42da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2703.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2703.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2705.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2705.cfg
index 0a3ecb71..0a3ecb71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2705.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2705.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2734.cfg
index 83fdd868..83fdd868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2735.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2735.cfg
index 32a72aa2..32a72aa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2735.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2735.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2742.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2742.cfg
new file mode 100644
index 00000000..eba0468c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2742.cfg
@@ -0,0 +1 @@
+align_var_def_span = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2752.cfg
index e15e7702..e15e7702 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2757.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2757.cfg
index e2118df5..e2118df5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2757.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2757.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2758.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2758.cfg
index dd2d0f6b..dd2d0f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2758.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2758.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2759.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2759.cfg
new file mode 100644
index 00000000..abdc53f4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2759.cfg
@@ -0,0 +1,8 @@
+nl_constr_colon          = force
+nl_constr_init_args      = force
+pos_constr_comma         = trail
+pos_constr_colon         = lead
+indent_columns           = 4
+indent_ctor_init         = 0
+indent_ctor_init_leading = 2
+indent_constr_colon      = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2771.cfg
index b34e82a7..b34e82a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2794.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2794.cfg
new file mode 100644
index 00000000..c193054f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2794.cfg
@@ -0,0 +1,7 @@
+indent_with_tabs       = 0
+nl_after_func_body     = 3
+cmt_width              = 75
+cmt_star_cont          = true
+cmt_sp_after_star_cont = 1
+
+cmt_indent_multi       = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2795.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2795.cfg
index 353cafa8..353cafa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2795.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2795.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2823.cfg
new file mode 100644
index 00000000..de58e056
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2823.cfg
@@ -0,0 +1,3 @@
+# 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 = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2831.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2831.cfg
index e7271af0..e7271af0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2831.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2831.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2836.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2836.cfg
new file mode 100644
index 00000000..41151a57
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2836.cfg
@@ -0,0 +1,2 @@
+# Add or remove newline between 'if' and '{'.
+nl_if_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2873.cfg
index be881c98..be881c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2873.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2873.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2879.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2879.cfg
index ba98f974..ba98f974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2879.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2879.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2886.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2886.cfg
new file mode 100644
index 00000000..eb4b5ca2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2886.cfg
@@ -0,0 +1 @@
+sp_compare = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2890.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2890.cfg
index 81ba72ca..81ba72ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2890.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2890.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2902.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2902.cfg
index 5806b371..5806b371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2902.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2902.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2907.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2907.cfg
index fa5b3018..fa5b3018 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2907.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2907.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2914.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2914.cfg
index 98d4511c..98d4511c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2914.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2914.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2921.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2921.cfg
index 142dc8dc..142dc8dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2921.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2921.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2930.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2930.cfg
index bd8cb9b0..bd8cb9b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2930.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2930.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2942.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2942.cfg
index e72ddc77..e72ddc77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2942.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2942.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2949.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2949.cfg
index b5ea1ffb..b5ea1ffb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_2949.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_2949.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3010.cfg
new file mode 100644
index 00000000..5f518291
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3010.cfg
@@ -0,0 +1 @@
+indent_with_tabs = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3025.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3025.cfg
new file mode 100644
index 00000000..5e545c50
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3025.cfg
@@ -0,0 +1 @@
+sp_cmt_cpp_start = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3034.cfg
new file mode 100644
index 00000000..77557ac3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3034.cfg
@@ -0,0 +1,4 @@
+output_tab_size     = 2
+indent_columns      = 2
+nl_after_brace_open = true
+mod_full_brace_if   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3040.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3040.cfg
new file mode 100644
index 00000000..12c8ebaf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3040.cfg
@@ -0,0 +1,7 @@
+indent_columns                  = 2
+indent_switch_case              = 2
+nl_before_case                  = true
+nl_after_case                   = true
+eat_blanks_before_close_brace   = true
+mod_move_case_break             = true
+mod_case_brace                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3044.cfg
new file mode 100644
index 00000000..c2f9ade5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3044.cfg
@@ -0,0 +1,7 @@
+output_tab_size       = 2
+indent_columns        = 2
+indent_switch_case    = 2
+nl_before_case        = true
+nl_after_case         = true
+nl_after_switch       = force
+mod_case_brace        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3048.cfg
new file mode 100644
index 00000000..fb4171d7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3048.cfg
@@ -0,0 +1,10 @@
+output_tab_size                 = 2
+indent_columns                  = 2
+indent_switch_case              = 2
+nl_if_brace                     = force
+nl_else_brace                   = force
+nl_before_case                  = true
+nl_after_case                   = true
+eat_blanks_before_close_brace   = true
+mod_full_brace_if               = add
+mod_case_brace                  = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3052.cfg
new file mode 100644
index 00000000..f7c29b8e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3052.cfg
@@ -0,0 +1,4 @@
+input_tab_size        = 4
+output_tab_size       = 4
+indent_columns        = 4
+pp_ignore_define_body = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054-2.cfg
new file mode 100644
index 00000000..a41640f0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054-2.cfg
@@ -0,0 +1,3 @@
+indent_columns = 2
+nl_fdef_brace  = force
+code_width     = 80
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054.cfg
new file mode 100644
index 00000000..a88303ba
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3054.cfg
@@ -0,0 +1,5 @@
+sp_cpp_lambda_square_paren  = remove
+sp_cpp_lambda_argument_list = remove
+sp_cpp_lambda_paren_brace   = remove
+sp_inside_square            = remove
+indent_columns              = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3055.cfg
new file mode 100644
index 00000000..307e5d93
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3055.cfg
@@ -0,0 +1,6 @@
+pp_space       = force
+pp_space_count = 2
+
+# Whether to indent '#define' at the brace level. If false, these are
+# indented from column 1.
+pp_define_at_level=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3058.cfg
new file mode 100644
index 00000000..1619b851
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3058.cfg
@@ -0,0 +1,5 @@
+indent_columns     = 2
+indent_with_tabs   = 0
+indent_switch_case = 2
+nl_after_case      = true
+mod_case_brace     = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_0nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_0nl.cfg
new file mode 100644
index 00000000..53a71184
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_0nl.cfg
@@ -0,0 +1,13 @@
+cmt_width=30
+code_width=30
+eat_blanks_after_open_brace=true
+nl_inside_empty_func=2
+nl_fdef_brace=force
+indent_columns=4
+indent_class=true
+indent_with_tabs=0
+input_tab_size=4
+nl_func_type_name=force
+nl_before_func_body_def=2
+nl_end_of_file=remove
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_1nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_1nl.cfg
new file mode 100644
index 00000000..ad1c0bbc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_1nl.cfg
@@ -0,0 +1,14 @@
+cmt_width=30
+code_width=30
+eat_blanks_after_open_brace=true
+nl_inside_empty_func=2
+nl_fdef_brace=force
+indent_columns=4
+indent_class=true
+indent_with_tabs=0
+input_tab_size=4
+nl_func_type_name=force
+nl_before_func_body_def=2
+nl_end_of_file=force
+nl_end_of_file_min=1
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_2nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_2nl.cfg
new file mode 100644
index 00000000..27325b31
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_2nl.cfg
@@ -0,0 +1,14 @@
+cmt_width=30
+code_width=30
+eat_blanks_after_open_brace=true
+nl_inside_empty_func=2
+nl_fdef_brace=force
+indent_columns=4
+indent_class=true
+indent_with_tabs=0
+input_tab_size=4
+nl_func_type_name=force
+nl_before_func_body_def=2
+nl_end_of_file=force
+nl_end_of_file_min=2
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_3nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_3nl.cfg
new file mode 100644
index 00000000..276c7d72
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3061_3nl.cfg
@@ -0,0 +1,14 @@
+cmt_width=30
+code_width=30
+eat_blanks_after_open_brace=true
+nl_inside_empty_func=2
+nl_fdef_brace=force
+indent_columns=4
+indent_class=true
+indent_with_tabs=0
+input_tab_size=4
+nl_func_type_name=force
+nl_before_func_body_def=2
+nl_end_of_file=force
+nl_end_of_file_min=3
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3080.cfg
new file mode 100644
index 00000000..748a6dad
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3080.cfg
@@ -0,0 +1 @@
+sp_after_decltype = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3097.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3097.cfg
new file mode 100644
index 00000000..bce2060e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_3097.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_start = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_670.cfg
index 504b1d7d..504b1d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_681.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_681.cfg
index 901b0c8e..901b0c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_681.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_681.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_931.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_931.cfg
index 45879950..45879950 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_931.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_931.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_995-do.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_995-do.cfg
index ba4e6387..ba4e6387 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Issue_995-do.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Issue_995-do.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/NewLine-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-f.cfg
index 8da1e530..8da1e530 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/NewLine-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/NewLine-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-r.cfg
index 329f5112..329f5112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/NewLine-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/NewLine-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/STUCK_macro-difficulties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/STUCK_macro-difficulties.cfg
index c7ce0fd8..c7ce0fd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/STUCK_macro-difficulties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/STUCK_macro-difficulties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U-J.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U-J.cfg
index 21e55d74..21e55d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U-J.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U-J.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U01-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U01-Cs.cfg
index 89f36ae7..89f36ae7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U01-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U01-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U02-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U02-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U02-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cs.cfg
index c7d6aeda..c7d6aeda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U02-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U02-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U03-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cpp.cfg
index d0f33089..d0f33089 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U03-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U03-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cs.cfg
index 24961370..24961370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U03-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U03-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U04-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U04-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U04-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cs.cfg
index b331f6f8..b331f6f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U04-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U04-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U05-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U05-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U05-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U05-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U06-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cpp.cfg
index 55fcc716..55fcc716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U06-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U06-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cs.cfg
index 03c2c765..03c2c765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U06-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U06-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U07-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cpp.cfg
index 9cee7fef..9cee7fef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U07-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U07-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cs.cfg
index b972e1fd..b972e1fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U07-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U07-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U08-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cpp.cfg
index 967ea74d..967ea74d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U08-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U08-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cs.cfg
index 776d51c4..31f8df36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U08-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U08-Cs.cfg
@@ -57,7 +57,7 @@ sp_inside_paren=remove
 sp_paren_paren=remove
 sp_balance_nested_parens=false
 sp_paren_brace=force
-sp_after_type=ignore
+sp_after_type=remove
 sp_template_angle=remove
 sp_before_angle=remove
 sp_inside_angle=remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U09-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U09-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U09-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cs.cfg
index d74080d2..d74080d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U09-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U09-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U10-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cpp.cfg
index 76c1c8c3..76c1c8c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U10-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U10-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cs.cfg
index 42254ddb..42254ddb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U10-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U10-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U11-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cpp.cfg
index 07ba9e26..07ba9e26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U11-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U11-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cs.cfg
index 70557c46..70557c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U11-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U11-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U12-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U12-Cpp.cfg
index 581594ac..581594ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U12-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U12-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U13-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cpp.cfg
index 162b13d4..162b13d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U13-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U13-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cs.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U13-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U13-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U14-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U14-Cpp.cfg
index 967ea74d..967ea74d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U14-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U14-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U15-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U15-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U15-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cs.cfg
index 5a700342..5a700342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U15-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U15-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U16-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U16-Cpp.cfg
index 425ee375..425ee375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U16-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U16-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U18-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U18-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U18-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U18-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U21-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U21-Cpp.cfg
index fd27114f..fd27114f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U21-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U21-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U23-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U23-Cpp.cfg
index 04863187..04863187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U23-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U23-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U24-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U24-Cpp.cfg
index bc46ae54..bc46ae54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U24-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U24-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U25-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U25-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U25-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U25-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U26-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U26-Cpp.cfg
index 2e611f4b..2e611f4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U26-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U26-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U27-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U27-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U27-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U27-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U28-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U28-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U28-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U28-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U29-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U29-Cpp.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U29-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U29-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U30-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U30-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U30-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U30-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U31-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U31-Cpp.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U31-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U31-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U33-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U33-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U33-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U33-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U36-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U36-Cpp.cfg
index b655be2c..b655be2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/U36-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/U36-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-10496.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-10496.cfg
index 42f6ee64..42f6ee64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-10496.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-10496.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-11095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11095.cfg
index 6c12366e..6c12366e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-11095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11095.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-11662.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11662.cfg
index 24cf86a8..24cf86a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-11662.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11662.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-11993.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11993.cfg
index 57e7ff00..57e7ff00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-11993.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-11993.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-12046.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-12046.cfg
index 4dcd62eb..4dcd62eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-12046.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-12046.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1288.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1288.cfg
index 3b6cf1b4..3b6cf1b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1288.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1288.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1338.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1338.cfg
index 0eef21b4..0eef21b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1338.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1338.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1340.cfg
index 8a43dca1..8a43dca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1343.cfg
index f5276e1f..f5276e1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1344.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1344.cfg
index 9e9937d2..9e9937d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1344.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1344.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1346.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1346.cfg
index 4074ff52..4074ff52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1346.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1346.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1347.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1347.cfg
index ee4173ec..ee4173ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1347.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1347.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1350.cfg
index 082a647f..082a647f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1350.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1350.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1356.cfg
index 948f20b6..948f20b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1356.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1356.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1358.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1358.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1358.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1358.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-13955.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-13955.cfg
index d1c7c955..d1c7c955 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-13955.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-13955.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-14131.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-14131.cfg
index 7c5535ea..7c5535ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-14131.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-14131.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-18437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18437.cfg
index 4ba5e224..4ba5e224 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-18437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18437.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-18777.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18777.cfg
index 7d4c013e..7d4c013e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-18777.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18777.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-18829.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18829.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-18829.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-18829.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1975.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1975.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1975.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1975.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1977.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1977.cfg
index 4563bfde..4563bfde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1977.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1977.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1978.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1978.cfg
index 2cf794e3..2cf794e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-1978.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-1978.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-19895.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-19895.cfg
index ac4012d1..ac4012d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-19895.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-19895.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2020.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2021.cfg
index 827d33e0..827d33e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2049.cfg
index f075ea03..f075ea03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2049.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-21730.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-21730.cfg
index 5443f32f..5443f32f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-21730.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-21730.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2650.cfg
index 46279443..46279443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2650.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2680.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2680.cfg
index 99790699..99790699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2680.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2680.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2684.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2684.cfg
index c048c827..c048c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2684.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2684.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2685.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2685.cfg
index 3f25a1fa..3f25a1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-2685.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-2685.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-29933.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29933.cfg
index 2f136516..2f136516 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-29933.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29933.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-29935.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29935.cfg
index f5543d81..f5543d81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-29935.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-29935.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-30088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30088.cfg
index 4abe03e1..4abe03e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-30088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30088.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-30498_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30498_2.cfg
index 8f635e72..8f635e72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-30498_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-30498_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-3083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-3083.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-3083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-3083.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-32657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32657.cfg
index 034ba33b..034ba33b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-32657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32657.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-32658.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32658.cfg
index d6bd63c5..d6bd63c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-32658.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-32658.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-37241.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-37241.cfg
index 5d377cfd..5d377cfd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-37241.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-37241.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-58354.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-58354.cfg
index fb9ca61b..fb9ca61b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-58354.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-58354.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-64325.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-64325.cfg
index 44ee8b48..44ee8b48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-64325.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-64325.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-9917.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-9917.cfg
index f1fd0af3..f1fd0af3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/UNI-9917.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/UNI-9917.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Uncrustify.Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Uncrustify.Cpp.cfg
index 89855c3c..89855c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/Uncrustify.Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/Uncrustify.Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/add_long_closebrace_comment_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/add_long_closebrace_comment_1.cfg
index b8190eb1..b8190eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/add_long_closebrace_comment_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/add_long_closebrace_comment_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_call_user.cfg
index 3219bc4b..3219bc4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-func_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_def.cfg
index c4575b88..c4575b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-func_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-func_def.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-sp_after_oc_msg_receiver.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_after_oc_msg_receiver.cfg
index 8e25aaed..8e25aaed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-sp_after_oc_msg_receiver.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_after_oc_msg_receiver.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-sp_inside_braces_oc_dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_inside_braces_oc_dict.cfg
index 57e2463e..57e2463e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet-sp_inside_braces_oc_dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet-sp_inside_braces_oc_dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet.cfg
index bb3c5d01..d3729edf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/aet.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/aet.cfg
@@ -113,6 +113,7 @@ sp_after_byref                                       = force
 sp_after_byref_func                                  = force
 sp_before_byref_func                                 = remove
 sp_after_type                                        = force
+sp_after_decltype                                    = force
 sp_before_template_paren                             = ignore
 sp_template_angle                                    = remove
 sp_before_angle                                      = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/al.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/al.cfg
index 669cef45..669cef45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/al.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/al.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-1.cfg
index 720f003e..720f003e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-2.cfg
index ea78a8d4..ea78a8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-3.cfg
index 1b46c840..1b46c840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-330.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-330.cfg
index 7a2ce116..7a2ce116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-330.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-330.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-objc-like-xcode.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-objc-like-xcode.cfg
index 3b321b11..3b321b11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align-objc-like-xcode.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align-objc-like-xcode.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_decl_func-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-0.cfg
index fee6fea1..fee6fea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_decl_func-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_decl_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-1.cfg
index 2175c1e2..2175c1e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_decl_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_decl_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-2.cfg
index 9e3a2779..9e3a2779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_decl_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_decl_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_func_proto_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_func_proto_1.cfg
index 378039a7..378039a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_func_proto_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_func_proto_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_span-1.cfg
index fda177f9..fda177f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_assign_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_assign_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_asterisk_after_type_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_asterisk_after_type_cast.cfg
index 4a781152..4a781152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_asterisk_after_type_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_asterisk_after_type_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_attr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_attr.cfg
index 3249cd7b..3249cd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_attr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_attr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_class-constr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_class-constr.cfg
index 8824d97a..8824d97a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_class-constr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_class-constr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_continuation_left_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_continuation_left_shift.cfg
index 767f2adc..767f2adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_continuation_left_shift.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_continuation_left_shift.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_default_after_override.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_default_after_override.cfg
index 7373e8d1..7373e8d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_default_after_override.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_default_after_override.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_eigen_comma_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_eigen_comma_init.cfg
index a798cc5f..a798cc5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_eigen_comma_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_eigen_comma_init.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_fcall-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall-2.cfg
index 795a16e9..795a16e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_fcall-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_fcall.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall.cfg
index 2df9b2e0..2df9b2e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_fcall.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_fcall.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params-t.cfg
index 6072ca53..6072ca53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_gap.cfg
index 314c2e1b..314c2e1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_span-1.cfg
index 5695e5a4..5695e5a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_1.cfg
index acae1cc7..acae1cc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_2.cfg
index 355705f1..355705f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_3.cfg
index 48912fce..48912fce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_4.cfg
index 284a5ee8..284a5ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_params_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_params_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_1.cfg
index b6a93b5b..b6a93b5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_2.cfg
index 363ea06c..363ea06c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_3.cfg
index 3a5ac106..3a5ac106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_4.cfg
index 6b084d86..6b084d86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_5.cfg
index 8a8dff6b..8a8dff6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_func_proto_thresh_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_func_proto_thresh_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_keep_extra.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_keep_extra.cfg
index fcaab9f2..fcaab9f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_keep_extra.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_keep_extra.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_oc_msg_colon_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_oc_msg_colon_span-1.cfg
index 9681d152..9681d152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_oc_msg_colon_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_oc_msg_colon_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_right_cmt_gap-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_cmt_gap-1.cfg
index 46aaf838..46aaf838 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_right_cmt_gap-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_cmt_gap-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_right_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_comment.cfg
index 1551b394..1551b394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_right_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_right_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_same_func_call_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_same_func_call_params-t.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_same_func_call_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_same_func_call_params-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_span_418.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_418.cfg
index cdf7f052..cdf7f052 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_span_418.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_418.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_span_419.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_419.cfg
index a11c2102..a11c2102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_span_419.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_span_419.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_thresh_416.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_416.cfg
index 6280b856..6280b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_thresh_416.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_416.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_thresh_417.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_417.cfg
index 9d09abb2..9d09abb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_sf_call_thresh_417.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_sf_call_thresh_417.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_stack.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_stack.cfg
index d53a6bb3..d53a6bb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_stack.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_stack.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_typedef_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-1.cfg
index ea45e4d8..ea45e4d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_typedef_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_typedef_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-2.cfg
index 252f07ea..252f07ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_typedef_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_typedef_gap-3_span-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_gap-3_span-5.cfg
index 338f078f..338f078f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_typedef_gap-3_span-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_typedef_gap-3_span-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_class_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_class_span-1.cfg
index a1b4122c..a1b4122c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_class_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_class_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_def_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_1.cfg
index 5cadc402..5cadc402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_def_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_def_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_2.cfg
index bb9be8ad..bb9be8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_def_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_def_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_3.cfg
index edb77f43..edb77f43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/align_var_def_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/align_var_def_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/amxmodx.cfg
index 2c87c362..2c87c362 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/amxmodx.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/annotation.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/annotation.cfg
index 0d800a82..0d800a82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/annotation.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/annotation.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/anonymous_enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/anonymous_enum.cfg
index 503a2cb5..503a2cb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/anonymous_enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/anonymous_enum.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/arith-vs-ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/arith-vs-ptr.cfg
index 60c8d23c..60c8d23c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/arith-vs-ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/arith-vs-ptr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/attribute_specifier_seqs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/attribute_specifier_seqs.cfg
index 8eec117f..8eec117f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/attribute_specifier_seqs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/attribute_specifier_seqs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon.cfg
index f3e3ce77..f3e3ce77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon2.cfg
index 97783b66..97783b66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon3.cfg
index 30f50cb7..30f50cb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon4.cfg
index bdf0f374..bdf0f374 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/avalon4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/avalon4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben2.cfg
index ff3bd751..ff3bd751 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_001.cfg
index e1bce1fa..e1bce1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_003.cfg
index b6dffc7c..b6dffc7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_004.cfg
index fa3c13c3..fa3c13c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_005.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_005.cfg
index 6784d5f8..6784d5f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_005.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_005.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_006.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_006.cfg
index 2767d063..2767d063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_006.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_006.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_008.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_008.cfg
index 432f7093..432f7093 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_008.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_008.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_009.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_009.cfg
index 314bb848..314bb848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_009.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_009.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_010.cfg
index c4536db3..c4536db3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_010.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_010.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_011.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_011.cfg
index 6ade29ad..6ade29ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_011.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_011.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_012.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_012.cfg
index 47906d8b..47906d8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_012.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_012.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_013.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_013.cfg
index be76962d..be76962d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_013.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_013.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_014.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_014.cfg
index cd7b8cff..cd7b8cff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_014.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_014.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_015.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_015.cfg
index 0e139678..0e139678 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_015.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_015.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_016.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_016.cfg
index 9b863f1d..9b863f1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_016.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_016.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_017.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_017.cfg
index a4acecc3..a4acecc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_017.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_017.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_018.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_018.cfg
index 06fe5b60..06fe5b60 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_018.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_018.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_020.cfg
index 8cd270ef..8cd270ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_021.cfg
index 7012173d..7012173d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_022.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_022.cfg
index 8311b975..8311b975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_022.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_022.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_023.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_023.cfg
index acb9b682..acb9b682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_023.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_023.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_024.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_024.cfg
index 37954be0..37954be0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_024.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_024.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_026.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_026.cfg
index f7008ee3..f7008ee3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_026.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_026.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_027.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_027.cfg
index fbbdb06a..fbbdb06a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_027.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_027.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_028.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_028.cfg
index 62848095..62848095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_028.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_028.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_029.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_029.cfg
index a0c2e18c..a0c2e18c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_029.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_029.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_030.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_030.cfg
index 8663afd4..8663afd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_030.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_030.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_031.cfg
index fe2182c9..fe2182c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_031.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_031.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_032.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_032.cfg
index e99f12ab..e99f12ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_032.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_032.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_033.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_033.cfg
index 3f1ffc6c..3f1ffc6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_033.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_033.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_034.cfg
index 0681b1b8..0681b1b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_034.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_034.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_036.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_036.cfg
index 5a5f216b..5a5f216b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_036.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_036.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_037.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_037.cfg
index 97daab41..97daab41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_037.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_037.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_038.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_038.cfg
index 4384cfbd..4384cfbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_038.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_038.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_042.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_042.cfg
index c98cdf54..c98cdf54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_042.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_042.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_043.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_043.cfg
index fcbc9ddc..fcbc9ddc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_043.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_043.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_044.cfg
index 6815087d..6815087d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_044.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_044.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_045.cfg
index 3ff68ef5..3ff68ef5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_045.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_045.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_047.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_047.cfg
index b00b8995..b00b8995 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_047.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_047.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_048.cfg
index 81d0ba54..81d0ba54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_048.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_048.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_049.cfg
index b8e6f708..b8e6f708 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_049.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_050.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_050.cfg
index 0f0e30ac..0f0e30ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_050.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_050.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_051.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_051.cfg
index 786fb030..786fb030 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_051.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_051.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_052.cfg
index ba150be7..ba150be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_053.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_053.cfg
index 7cf1c682..7cf1c682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_053.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_053.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_054.cfg
index 56661763..56661763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_054.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_054.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_055.cfg
index f050b219..f050b219 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_055.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_055.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_056.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_056.cfg
index 43e9f6cc..43e9f6cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_056.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_056.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_057.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_057.cfg
index fbf24d72..fbf24d72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_057.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_057.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_058.cfg
index 397ae6e9..397ae6e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_058.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_058.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_061.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_061.cfg
index 89f76fae..89f76fae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_061.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_061.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_063.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_063.cfg
index 3c5e88f1..3c5e88f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_063.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_063.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_064.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_064.cfg
index f56efbdf..f56efbdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_064.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_064.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_065.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_065.cfg
index 21d55b16..21d55b16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_065.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_065.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_069.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_069.cfg
index d42173e1..d42173e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_069.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_069.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_070.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_070.cfg
index f304ca8a..f304ca8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_070.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_070.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_071.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_071.cfg
index 869f2a94..869f2a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_071.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_071.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_072.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_072.cfg
index 973d8c6c..973d8c6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_072.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_072.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_073.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_073.cfg
index 49f69643..49f69643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_073.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_073.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_074.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_074.cfg
index 9b14e775..9b14e775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_074.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_074.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_075.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_075.cfg
index 9eca8a9b..9eca8a9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_075.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_075.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_076.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_076.cfg
index fb27ba74..fb27ba74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_076.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_076.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_077.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_077.cfg
index 4e9760f7..4e9760f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_077.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_077.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_078.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_078.cfg
index 54fcc628..54fcc628 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_078.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_078.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_079.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_079.cfg
index 77a732e5..77a732e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_079.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_079.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_080.cfg
index 45e16a8d..45e16a8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_080.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_080.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_081.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_081.cfg
index dc15820d..dc15820d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_081.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_081.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_083.cfg
index 2ccee465..2ccee465 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_083.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_084.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_084.cfg
index bbb0e675..bbb0e675 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_084.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_084.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_085.cfg
index b02673d7..b02673d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_085.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_085.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_086.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_086.cfg
index ecf99d0d..ecf99d0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_086.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_086.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_087.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_087.cfg
index df282f1e..df282f1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_087.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_087.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_088.cfg
index 19cc7dc4..19cc7dc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_088.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_089.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_089.cfg
index d3c152df..d3c152df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_089.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_089.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_090.cfg
index eba1ab79..eba1ab79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_090.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_090.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_091.cfg
index aec90af1..aec90af1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_092.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_092.cfg
index bb993d75..bb993d75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_092.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_092.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_093.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_093.cfg
index 4e50b52b..4e50b52b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_093.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_093.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_094.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_094.cfg
index 9ab0c51f..9ab0c51f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_094.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_094.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_095.cfg
index edb10a4f..edb10a4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_095.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_098.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_098.cfg
index 9dddd073..9dddd073 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_098.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_098.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_099.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_099.cfg
index 6cd10860..6cd10860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_099.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_099.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_100.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_100.cfg
index bb7a14c1..bb7a14c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_100.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_100.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_101.cfg
index 50078f96..50078f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_102.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_102.cfg
index 82fa033c..82fa033c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_102.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_102.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_103.cfg
index 3d212ad4..3d212ad4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_103.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_104.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_104.cfg
index 80870cfe..80870cfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_104.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_104.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_105.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_105.cfg
index 4b30fcfe..4b30fcfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ben_105.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ben_105.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/block_pointer.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/block_pointer.cfg
index 70c21bbd..70c21bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/block_pointer.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/block_pointer.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/blocks.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/blocks.cfg
index 74ed7e4f..74ed7e4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/blocks.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/blocks.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-eol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-break.cfg
index d2abdeb6..d2abdeb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-eol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-eol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-force.cfg
index 51044559..51044559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-eol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol.cfg
index f7fe1330..f7fe1330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-sol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-break.cfg
index e07ab7e9..e07ab7e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-sol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-sol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-force.cfg
index 36f81a26..36f81a26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-sol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol.cfg
index f89d30b2..9dbcbaf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bool-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bool-pos-sol.cfg
@@ -2,4 +2,4 @@
 sp_after_comma                  = force
 indent_columns                  = 3
 pos_bool                        = lead
-pos_comma                       = lead
\ No newline at end of file
+pos_comma                       = lead
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-allman.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-allman.cfg
index 0e903302..0e903302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-allman.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-allman.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-banner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.cfg
index 2fc753a6..2fc753a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-banner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-banner.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.rerun.cfg
index df289545..df289545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-banner.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-banner.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-gnu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-gnu.cfg
index c5bd1371..c5bd1371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-gnu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-gnu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-kr-br.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-br.cfg
index 59bc4084..59bc4084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-kr-br.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-br.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-kr-nobr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-nobr.cfg
index 970b1ab0..970b1ab0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-kr-nobr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr-nobr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-kr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr.cfg
index 7ef5aa16..7ef5aa16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-kr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-kr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-remove-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-2.cfg
index 9aa693fc..9aa693fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-remove-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-remove-all.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-all.cfg
index ca279abd..ca279abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-remove-all.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-remove-all.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-ws.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws.cfg
index 76d8908a..76d8908a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-ws.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-ws2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws2.cfg
index 55eb6ece..55eb6ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/brace-ws2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/brace-ws2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1001.cfg
index d8255ca7..d8255ca7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1003.cfg
index 242b3a13..242b3a13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1004.cfg
index f479bada..f479bada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1020.cfg
index 51643e87..51643e87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1108.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1108.cfg
index 741ba79d..741ba79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1108.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1108.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1160.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1160.cfg
index afc7030d..afc7030d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1160.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1160.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1161.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1161.cfg
index c7977cf0..c7977cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1161.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1161.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1169.cfg
index 0615b330..0615b330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1169.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1169.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1170.cfg
index 9171180b..9171180b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1236.cfg
index 0c60d5be..0c60d5be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1236.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1296.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1296.cfg
index 82a970ff..82a970ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1296.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1296.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1315.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1315.cfg
index 49a716d0..49a716d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1315.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1315.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1324.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1324.cfg
index 289ca9d5..289ca9d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1324.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1324.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1340.cfg
index 6ec6568e..6ec6568e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1349.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1349.cfg
index abe4253c..abe4253c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1349.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1349.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1395.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1395.cfg
index c2bed595..c2bed595 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1395.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1395.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1402.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1403.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1403.cfg
index 8e10acd4..8e10acd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1403.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1403.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1432.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1432.cfg
index 4ae27492..4ae27492 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1432.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1432.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1439.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1439.cfg
index f625249d..f625249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1439.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1439.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1452.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1452.cfg
index dbd0e9b4..dbd0e9b4 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1452.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1452.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1620.cfg
index 1d7582b8..1d7582b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1620.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1637.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1637.cfg
index 40820de1..40820de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1637.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1637.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1649.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1649.cfg
index 472975ab..472975ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1649.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1649.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1650.cfg
index cd5a2504..cd5a2504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1650.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_167.cfg
index 6ed02f2e..6ed02f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1689.cfg
index 0660e498..0660e498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1691.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1691.cfg
index 03600f80..03600f80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1691.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1691.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1702.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1702.cfg
index 1c415eec..1c415eec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1702.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1702.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1717.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1717.cfg
index a6c7322f..a6c7322f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1717.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1717.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1718.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1718.cfg
index e55de095..e55de095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1718.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1718.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1758-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1758-f.cfg
index 90d17ebd..90d17ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1758-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1758-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1854.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1854.cfg
index ebc5c5e3..ebc5c5e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1854.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1854.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1862.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1862.cfg
index c23b9027..c23b9027 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_1862.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_1862.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2285.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2285.cfg
index fa3b437b..fa3b437b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2285.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2285.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2322.cfg
index 9743a828..9743a828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2322.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2331.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2331.cfg
index 4a4af2f3..4a4af2f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2331.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2331.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2371.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2371.cfg
index 1f207beb..1f207beb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2371.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2371.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2402.cfg
index 85c3a458..85c3a458 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2433_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_1.cfg
index 17fd04a4..17fd04a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2433_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2433_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_2.cfg
index 89f0b916..89f0b916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_2433_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_2433_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_340.cfg
index f56e7a43..f56e7a43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_472.cfg
index 68d6f99b..68d6f99b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_472.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_472.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_488.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_488.cfg
index 0319ef54..0319ef54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_488.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_488.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_489.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_489.cfg
index 61d4693c..61d4693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_489.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_489.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_620.cfg
index 4486cd45..4486cd45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_620.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_633.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_633.cfg
index 61833884..61833884 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_633.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_633.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_657.cfg
index 109e3750..109e3750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_657.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_664.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_664.cfg
index 3799bd89..3799bd89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_664.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_664.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_670.cfg
index fe57c0af..fe57c0af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_671.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_671.cfg
index 00c0cf36..00c0cf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_671.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_671.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_841.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_841.cfg
index 2ab54cc1..2ab54cc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_841.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_841.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_858-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-f.cfg
index 1f03334a..1f03334a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_858-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_858-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-r.cfg
index 82e3cb22..82e3cb22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_858-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_858-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_125-412.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_125-412.cfg
index 2498ac1b..2498ac1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_125-412.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_125-412.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_322.cfg
index e49770be..e49770be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_322.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_359.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_359.cfg
index ab9c63fb..ab9c63fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_359.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_359.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_405.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_405.cfg
index 0bdfce99..0bdfce99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_405.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_405.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_409-create.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-create.cfg
index ec0f6ca4..ec0f6ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_409-create.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-create.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_409-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-split.cfg
index 9e272905..9e272905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_409-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_409-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_478.cfg
index 18db9a6d..18db9a6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_663.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_663.cfg
index 9d780855..9d780855 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_663.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_663.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_666.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_666.cfg
index 6acabd49..6acabd49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_666.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_666.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_752.cfg
index 7bc4c41d..7bc4c41d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_771.cfg
index 69b6e1a3..69b6e1a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/bug_i_771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/bug_i_771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-2.cfg
index fccbbfe8..fccbbfe8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-center.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-center.cfg
index 9d8bdc1f..9d8bdc1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-center.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-center.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-left.cfg
index 6bc66685..6bc66685 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-right.cfg
index 60a2fbbc..60a2fbbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/byref-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/byref-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/case-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-1.cfg
index 7c65a819..7c65a819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/case-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/case-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-2.cfg
index 07c0566d..07c0566d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/case-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/case-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-3.cfg
index 74f16293..74f16293 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/case-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/case-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-sp-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-a.cfg
index 488198a9..488198a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-sp-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-sp-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-r.cfg
index 1d0138a2..1d0138a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-sp-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-sp-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-type.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-type.cfg
index 5900ffd5..5900ffd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-type.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-type.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-types.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-types.txt
index cfc74c6e..cfc74c6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast-types.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast-types.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast.cfg
index feac5350..feac5350 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cgal.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cgal.cfg
index a4ec1fa0..a4ec1fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cgal.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cgal.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/clang-has_include.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clang-has_include.cfg
index 35d668f3..35d668f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/clang-has_include.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clang-has_include.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/clark.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.cfg
index 2ea5739a..2ea5739a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/clark.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/clark.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.rerun.cfg
index 3b33c7d6..3b33c7d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/clark.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/clark.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-eol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol-add.cfg
index fb14545e..fb14545e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-eol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol.cfg
index ddb0e11b..ddb0e11b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-sol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol-add.cfg
index 960dade0..960dade0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-sol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol.cfg
index a57e30d3..a57e30d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-colon-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-colon-pos-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-header.h
index 32e68a34..32e68a34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-nl_func-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add.cfg
index d60ffa9b..d60ffa9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-nl_func-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-nl_func-add2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add2.cfg
index f8a35e0d..f8a35e0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-nl_func-add2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-add2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-nl_func-del.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-del.cfg
index b90f2f75..b90f2f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-nl_func-del.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-nl_func-del.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-on-colon-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-on-colon-indent.cfg
index 86fec34f..86fec34f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/class-on-colon-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/class-on-colon-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_convert_tab_to_spaces-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_convert_tab_to_spaces-t.cfg
index 98b3bcf3..98b3bcf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_convert_tab_to_spaces-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_convert_tab_to_spaces-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_cpp_to_c-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_cpp_to_c-t.cfg
index 85c3fec8..85c3fec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_cpp_to_c-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_cpp_to_c-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-1.cfg
index 8d0a8a16..8d0a8a16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-2.cfg
index fd9b9d25..fd9b9d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-3.cfg
index c8e6ce41..c8e6ce41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent_multi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent_multi-f.cfg
index 1bd265a3..1bd265a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_indent_multi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_indent_multi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_insert-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-0.cfg
index 86d05f95..86d05f95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_insert-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_insert-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-1.cfg
index 91dbf03a..91dbf03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_insert-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_insert-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_multi_check_last-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_check_last-f.cfg
index 7fdebde0..7fdebde0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_multi_check_last-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_check_last-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_multi_first_len_minimum-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_first_len_minimum-1.cfg
index e7d99a98..e7d99a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_multi_first_len_minimum-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_multi_first_len_minimum-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_nl_end.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_nl_end.cfg
index 1c0b396a..1c0b396a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cmt_nl_end.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_nl_end.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_reflow.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_reflow.cfg
new file mode 100644
index 00000000..9b280d18
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cmt_reflow.cfg
@@ -0,0 +1,6 @@
+cmt_align_doxygen_javadoc_tags = true
+cmt_indent_multi = true
+cmt_reflow_indent_to_paragraph_start = true
+cmt_reflow_mode = 2
+cmt_sp_after_star_cont = 2
+cmt_width = 70
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/code_width-70.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-70.cfg
index 07c25e5c..07c25e5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/code_width-70.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-70.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/code_width-80.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-80.cfg
index 4bdb0ce7..4bdb0ce7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/code_width-80.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/code_width-80.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cond-1.cfg
index 61669da9..61669da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cond-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cond-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/const_throw.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/const_throw.cfg
index 41b3ecef..41b3ecef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/const_throw.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/const_throw.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/constr_colon.cfg
index 3397573a..3397573a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp17.cfg
index 1865e0c8..1865e0c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp_to_c-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-1.cfg
index 83e3aa7c..83e3aa7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp_to_c-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp_to_c-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-2.cfg
index 9f0d9e3a..9f0d9e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp_to_c-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp_to_c-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-3.cfg
index 20bbb9e1..20bbb9e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cpp_to_c-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cpp_to_c-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cs_generics.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cs_generics.cfg
index e4320a80..e4320a80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cs_generics.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cs_generics.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cu.cfg
index 40dff3e5..40dff3e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/cu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/cu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/custom-open.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open.cfg
index 5b4539e2..5b4539e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/custom-open.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/custom-open2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open2.cfg
index 38e507b5..38e507b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/custom-open2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom-open2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/custom_types_ssl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom_types_ssl.cfg
index 4005234e..4005234e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/custom_types_ssl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/custom_types_ssl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d-tst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d-tst2.cfg
index db15aa59..db15aa59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d-tst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d-tst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d.cfg
index 8b63fd62..8b63fd62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d2.cfg
index ab3eebcf..ab3eebcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3.cfg
index 53a311b0..53a311b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d3a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3a.cfg
index f3cf7bb8..f3cf7bb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d3a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d3a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d_sp_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d_sp_paren.cfg
index 5b3443e6..5b3443e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/d_sp_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/d_sp_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/del_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/del_semicolon.cfg
index 13434168..13434168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/del_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/del_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/delete-space-oc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/delete-space-oc.cfg
new file mode 100644
index 00000000..4d8a15cb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/delete-space-oc.cfg
@@ -0,0 +1 @@
+sp_after_oc_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/disable_nl_cont.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/disable_nl_cont.cfg
index 9ea9350f..9ea9350f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/disable_nl_cont.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/disable_nl_cont.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/dont-detab-strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-detab-strings.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/dont-detab-strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-detab-strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/dont-process-defines.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-process-defines.cfg
index bfb66ec8..bfb66ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/dont-process-defines.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/dont-process-defines.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double-indent-objc-dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double-indent-objc-dict.cfg
index d4e9a1ae..d4e9a1ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double-indent-objc-dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double-indent-objc-dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double_angle_space_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_1.cfg
index 73319da9..73319da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double_angle_space_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double_angle_space_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_2.cfg
index 8d12b193..8d12b193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double_angle_space_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double_angle_space_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_3.cfg
index da6a41c2..da6a41c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/double_angle_space_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/double_angle_space_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/doxy-comment-no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-no.cfg
index bd2bd258..bd2bd258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/doxy-comment-no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/doxy-comment-yes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-yes.cfg
index 74043b68..74043b68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/doxy-comment-yes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-comment-yes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-javadoc-alignment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-javadoc-alignment.cfg
new file mode 100644
index 00000000..786a9ac7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/doxy-javadoc-alignment.cfg
@@ -0,0 +1,7 @@
+cmt_reflow_mode = 2
+cmt_width = 70
+cmt_sp_after_star_cont = 1
+cmt_indent_multi = true
+cmt_align_doxygen_javadoc_tags = true
+cmt_sp_before_doxygen_javadoc_tags = 1
+cmt_reflow_fold_regex_file="reflow_fold_regex.txt"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/eat_blanks_after_codewidth.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/eat_blanks_after_codewidth.cfg
new file mode 100644
index 00000000..1b24a7ac
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/eat_blanks_after_codewidth.cfg
@@ -0,0 +1,11 @@
+cmt_width=30
+code_width=30
+eat_blanks_after_open_brace=true
+nl_inside_empty_func=2
+nl_fdef_brace=force
+indent_columns=4
+indent_class=true
+indent_with_tabs=0
+input_tab_size=4
+nl_func_type_name=force
+nl_before_func_body_def=2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/else-if-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-1.cfg
index b4e4aecb..b4e4aecb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/else-if-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/else-if-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-2.cfg
index 75d7936e..75d7936e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/else-if-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/else-if-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/empty_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty_body.cfg
index 0276b19a..0276b19a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/empty_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/empty_body.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/endif.cfg
index ff69251b..ff69251b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum.cfg
index b39c0840..b39c0840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-3.cfg
index 7fe548e2..7fe548e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-4.cfg
index d42e6b1e..d42e6b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-6.cfg
index 6d4279ec..6d4279ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma_ifdef.cfg
index a2622767..a2622767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comma_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comma_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comment_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comment_wrap.cfg
index e42e00a1..e42e00a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/enum_comment_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/enum_comment_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/extern_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/extern_func.cfg
index a6135e8a..a6135e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/extern_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/extern_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/file-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file-header.h
index 63fb5185..63fb5185 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/file-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/file_footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_footer.txt
index 7ce80bad..7ce80bad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/file_footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/file_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_header.txt
index 5431d0ff..5431d0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/file_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/file_header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/footer.txt
index 1d2f941f..1d2f941f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/force_tab_after_define-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/force_tab_after_define-t.cfg
index 67b04e78..67b04e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/force_tab_after_define-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/force_tab_after_define-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/freebsd.cfg
index e34be04f..e34be04f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/freebsd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-1.cfg
index 14879a94..14879a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-2.cfg
index f9cf836c..f9cf836c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-def-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-3.cfg
index c868ae02..c868ae02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-def-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-def-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header.h
index e6f83943..e6f83943 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-header2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header2.h
index 52bdf970..52bdf970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func-header2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func-header2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_call_user.cfg
index 504fb3d8..504fb3d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_class.cfg
index 7f01b7be..7f01b7be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_param.cfg
index 3ad93ace..3ad93ace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/func_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/function_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/function_header.txt
index c6508a02..c6508a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/function_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/function_header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/functype_param-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-f.cfg
index 746b15f5..746b15f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/functype_param-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/functype_param-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-r.cfg
index 1576135f..1576135f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/functype_param-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/functype_param-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ger.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ger.cfg
index 976c0c35..976c0c35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ger.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ger.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/getset.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/getset.cfg
index 1e1ab8e9..1e1ab8e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/getset.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/getset.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/gh137.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh137.cfg
index 83da02ee..83da02ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/gh137.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh137.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/gh293.a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.a.cfg
index e875a54b..e875a54b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/gh293.a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/gh293.b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.b.cfg
index 1dc357ae..1dc357ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/gh293.b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/gh293.b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1516.cfg
index 8c03f30e..8c03f30e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1516.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1516.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1536.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.cfg
index 5506f68c..5506f68c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1536.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1536.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.txt
index d34c497d..d34c497d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1536.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1536.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1564.cfg
index 74c53e52..74c53e52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1768.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1768.cfg
index 9174483a..9174483a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i1768.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i1768.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i683.cfg
index 2b6edefe..2b6edefe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/i683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/i683.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/if_chain.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain.cfg
index b59d69f8..b59d69f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/if_chain.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/if_chain_braces_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain_braces_2.cfg
index aa9251c7..aa9251c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/if_chain_braces_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/if_chain_braces_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-1.cfg
index 943d0eb6..943d0eb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-multistring-coulmn1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-multistring-coulmn1.cfg
index 8ce9a4ff..8ce9a4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-multistring-coulmn1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-multistring-coulmn1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-objc-block.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-objc-block.cfg
index aee5aace..aee5aace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-objc-block.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-objc-block.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-vbrace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-vbrace.cfg
index 7e6ca7c1..7e6ca7c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent-vbrace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent-vbrace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_assign.cfg
index 6bad61f1..6bad61f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_assign.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_assign.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_boxed.cfg
index e20f0820..e20f0820 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_braces_no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_braces_no.cfg
index 24ca060b..24ca060b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_braces_no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_braces_no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_class-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t.cfg
index 78320e8a..78320e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_class-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t_columns-4.cfg
index 5184fc9a..5184fc9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-11.cfg
index 15cef67e..15cef67e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-2.cfg
index f33cb665..f33cb665 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-3.cfg
index 9c9e205f..9c9e205f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-4.cfg
index f4f5183a..f4f5183a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comma_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comma_brace.cfg
new file mode 100644
index 00000000..635c6cdf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comma_brace.cfg
@@ -0,0 +1,4 @@
+code_width                      = 60
+indent_columns                  = 4
+indent_comma_brace              = true
+indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_comment_align_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comment_align_thresh_2.cfg
index 2f5d5cab..2f5d5cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_comment_align_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_comment_align_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_compound_literal_return-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-false.cfg
index b686aabe..b686aabe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_compound_literal_return-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_compound_literal_return-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-true.cfg
index 9fa1d2ef..9fa1d2ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_compound_literal_return-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_compound_literal_return-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_continue-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_continue-8.cfg
index 9bc69559..9bc69559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_continue-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_continue-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_cs_delegate_brace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_cs_delegate_brace-t.cfg
index 9a4e6382..9a4e6382 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_cs_delegate_brace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_cs_delegate_brace-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ctor_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init.cfg
index 7d510489..cb1cef12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ctor_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init.cfg
@@ -1,4 +1,5 @@
 indent_columns                  = 2
+indent_before_class_colon       = 4
 indent_class_colon              = true
 indent_constr_colon             = true
 indent_ctor_init                = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ctor_init_leading.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init_leading.cfg
index 2a20e957..ce8fb22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ctor_init_leading.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_init_leading.cfg
@@ -1,4 +1,5 @@
 indent_columns                  = 2
+indent_before_class_colon       = -2
 indent_class_colon              = true
 indent_constr_colon             = true
 indent_ctor_init_leading        = 5
@@ -11,4 +12,6 @@ nl_constr_init_args             = add
 nl_func_def_start               = add
 nl_func_def_args                = add
 nl_before_access_spec           = 2
-pos_constr_comma                = trail_force
\ No newline at end of file
+pos_constr_comma                = trail_force
+nl_class_colon                  = force
+pos_class_colon                 = lead_force
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ctor_members_twice.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_members_twice.cfg
index 82c708d4..82c708d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ctor_members_twice.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ctor_members_twice.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_else_if-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_else_if-t.cfg
index 2dcd9a57..2dcd9a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_else_if-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_else_if-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_first_for_expr-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_first_for_expr-t.cfg
index ff68e85c..ff68e85c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_first_for_expr-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_first_for_expr-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_call_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_call_param.cfg
index 26b4e03a..26b4e03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_call_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_call_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_def_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_def_param.cfg
index c448b21f..c448b21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_def_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_def_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_param.cfg
index 7db464b4..7db464b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_proto_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_proto_param.cfg
index 6cfb83ed..6cfb83ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_func_proto_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_func_proto_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_inside_ternary_operator.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_inside_ternary_operator.cfg
index ad5f98ed..ad5f98ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_inside_ternary_operator.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_inside_ternary_operator.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_macro_brace-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-false.cfg
index f9e3bdca..f9e3bdca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_macro_brace-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_macro_brace-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-true.cfg
index 62573cad..62573cad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_macro_brace-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_macro_brace-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_namespace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace-t.cfg
index 90bbdaec..90bbdaec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_namespace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_namespace_single_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace_single_indent.cfg
index 9f66fea4..9f66fea4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_namespace_single_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_namespace_single_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_oc_inside_msg_sel.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_oc_inside_msg_sel.cfg
index b140f071..b140f071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_oc_inside_msg_sel.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_oc_inside_msg_sel.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_off_after_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_off_after_return.cfg
new file mode 100644
index 00000000..077c5f94
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_off_after_return.cfg
@@ -0,0 +1,3 @@
+indent_off_after_return     = true
+indent_off_after_return_new = false
+sp_after_decltype           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_once.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_once.cfg
index 013985b9..013985b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_once.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_once.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_param.cfg
index 07d98897..07d98897 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_after_func_call-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_call-t.cfg
index eafffebc..eafffebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_after_func_call-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_call-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_after_func_decl-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_decl-t.cfg
index c4db2ffe..c4db2ffe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_after_func_decl-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_decl-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_after_func_def-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_def-t.cfg
index 5d2895e9..5d2895e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_after_func_def-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_after_func_def-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_close-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-1.cfg
index 309be3e5..309be3e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_close-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_close-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-2.cfg
index 2a77fedf..2a77fedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_paren_close-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_paren_close-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_semicolon_for_paren-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_semicolon_for_paren-t.cfg
index 6b49dbd6..6b49dbd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_semicolon_for_paren-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_semicolon_for_paren-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_shift.cfg
index 8a848c34..8a848c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_shift.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_shift.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_single_newline.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_single_newline.cfg
index 1496b522..1496b522 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_single_newline.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_single_newline.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_sparen_extra-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_sparen_extra-8.cfg
index 6344ceb2..6344ceb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_sparen_extra-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_sparen_extra-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ternary_operator-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-1.cfg
index 80ea4e7a..80ea4e7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ternary_operator-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ternary_operator-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-2.cfg
index 1d5a91ab..1d5a91ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_ternary_operator-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_ternary_operator-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_using_block-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_using_block-f.cfg
index 2bfca802..2bfca802 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_using_block-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_using_block-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_var_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def.cfg
index 2faffc24..2faffc24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_var_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_var_def_cont-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def_cont-t.cfg
index f439a00b..f439a00b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_var_def_cont-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_var_def_cont-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_with_tabs-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_with_tabs-0.cfg
index bd2c3a08..bd2c3a08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/indent_with_tabs-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/indent_with_tabs-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/initlist_leading_commas.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/initlist_leading_commas.cfg
index ebd35547..ebd35547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/initlist_leading_commas.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/initlist_leading_commas.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/interface-keyword-in-cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/interface-keyword-in-cpp.cfg
index cbbf215b..cbbf215b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/interface-keyword-in-cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/interface-keyword-in-cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/invariant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/invariant.cfg
index a462b4d0..a462b4d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/invariant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/invariant.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1778.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1778.cfg
index 2f4bd642..2f4bd642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1778.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1778.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1782.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1782.cfg
index 6d50bfeb..6d50bfeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1782.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1782.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1804.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1804.cfg
index 4c424b89..4c424b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1804.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1804.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1887.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1887.cfg
index 956ea6a9..956ea6a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1887.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1887.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1916.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1916.cfg
index 414a4a96..414a4a96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1916.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1916.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1985.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1985.cfg
index 3be58c29..3be58c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1985.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1985.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1997.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1997.cfg
index 1f79d36e..1f79d36e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_1997.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_1997.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2124-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-1.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2124-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2124-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-2.cfg
index 34866fe3..34866fe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2124-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2124-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2209.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2209.cfg
index 414a7273..414a7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2209.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2209.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2623_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_1.cfg
index 56ab3a56..56ab3a56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2623_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2623_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_2.cfg
index 2848fb59..2848fb59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2623_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2623_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_3.cfg
index 52d17555..52d17555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2623_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2623_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2643.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2643.cfg
index 7f188f21..7f188f21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2643.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2643.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2656.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2656.cfg
index 3b020c33..3b020c33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2656.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2656.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2675.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2675.cfg
index 0eab0244..0eab0244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_2675.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_2675.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3031.cfg
new file mode 100644
index 00000000..8234c643
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3031.cfg
@@ -0,0 +1,5 @@
+nl_class_colon = force
+sp_after_class_colon = force
+sp_before_class_colon = force
+sp_after_send_oc_colon = remove
+sp_before_send_oc_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3116.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3116.cfg
new file mode 100644
index 00000000..03aecb39
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_3116.cfg
@@ -0,0 +1,5 @@
+indent_cpp_lambda_body = true
+indent_columns = 4
+indent_with_tabs = 0
+indent_continue = 4
+indent_paren_close = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_527.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_527.cfg
index 855f218d..855f218d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_527.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_527.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_564.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-a.cfg
new file mode 100644
index 00000000..24a1a182
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-a.cfg
@@ -0,0 +1,12 @@
+sp_paren_paren                  = remove
+sp_before_ptr_star              = force
+sp_after_ptr_star               = remove
+sp_before_byref                 = force
+sp_after_byref                  = remove
+sp_inside_fparen                = remove
+indent_columns                  = 4
+indent_class                    = true
+nl_class_brace                  = force
+sp_after_assign                 = remove
+sp_assign                       = force
+sp_assign_default               = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-b.cfg
new file mode 100644
index 00000000..b61ac3e2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574-i-b.cfg
@@ -0,0 +1,12 @@
+sp_paren_paren                  = remove
+sp_before_ptr_star              = force
+sp_after_ptr_star               = remove
+sp_before_byref                 = force
+sp_after_byref                  = remove
+sp_inside_fparen                = remove
+indent_columns                  = 4
+indent_class                    = true
+nl_class_brace                  = force
+sp_before_assign                = remove
+sp_assign                       = force
+sp_assign_default               = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574.cfg
index 925ee5fe..925ee5fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_672.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_672.cfg
index fb436753..fb436753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/issue_672.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/issue_672.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/java_foreach.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_foreach.cfg
index 56ec94cd..56ec94cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/java_foreach.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_foreach.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/java_synchronized_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_1.cfg
index e57bba91..e57bba91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/java_synchronized_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/java_synchronized_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_2.cfg
index 3512cdc8..3512cdc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/java_synchronized_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/java_synchronized_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/jdbi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-f.cfg
index fde00f38..fde00f38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/jdbi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/jdbi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-r.cfg
index ed2a6942..ed2a6942 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/jdbi-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/jdbi-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kdepim2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim2.cfg
index 18b12bbe..18b12bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kdepim2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kdepim3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim3.cfg
index 0fe42133..0fe42133 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kdepim3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kdepim5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim5.cfg
index 56a1b3da..56a1b3da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kdepim5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kdepim5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst.cfg
index 163d6f64..163d6f64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst2.cfg
index 7f531264..7f531264 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst3.cfg
index 7dc7a63b..7dc7a63b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst4.cfg
index a269bdf8..a269bdf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/kw_subst4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/kw_subst4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/label_colon_nl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_1.cfg
index 5c394f28..5c394f28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/label_colon_nl_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/label_colon_nl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_2.cfg
index b1fafca7..b1fafca7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/label_colon_nl_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/label_colon_nl_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda1.cfg
index 2535bb05..2535bb05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda2.cfg
index 9f698209..9f698209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda3.cfg
index ffed35eb..ffed35eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda_in_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda_in_one_liner.cfg
index aafff8c4..7b61e767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lambda_in_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lambda_in_one_liner.cfg
@@ -2,3 +2,6 @@ sp_cpp_lambda_square_brace      = remove
 sp_before_square                = remove
 nl_func_leave_one_liners        = true
 nl_cpp_lambda_leave_one_liners  = true
+nl_after_brace_open             = true
+sp_inside_braces                = force
+sp_inside_type_brace_init_lst   = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/leading-tabs-for-java-lambda.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leading-tabs-for-java-lambda.cfg
index ba1f063e..ba1f063e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/leading-tabs-for-java-lambda.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leading-tabs-for-java-lambda.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leave_one_liners.cfg
new file mode 100644
index 00000000..931e9465
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/leave_one_liners.cfg
@@ -0,0 +1,14 @@
+nl_assign_brace                         = force
+nl_enum_brace                           = force
+nl_if_brace                             = force
+nl_while_brace                          = force
+nl_do_brace                             = force
+nl_for_brace                            = force
+
+nl_assign_leave_one_liners              = true
+nl_enum_leave_one_liners                = true
+nl_func_leave_one_liners                = true
+nl_if_leave_one_liners                  = true
+nl_while_leave_one_liners               = true
+nl_do_leave_one_liners                  = true
+nl_for_leave_one_liners                 = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/libd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/libd.cfg
index a29c77a4..a29c77a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/libd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/libd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lineEndings-to-Mac.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Mac.cfg
index d8b41944..d8b41944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lineEndings-to-Mac.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Mac.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lineEndings-to-Unix.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Unix.cfg
index e6cf9411..e6cf9411 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lineEndings-to-Unix.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Unix.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lineEndings-to-Win.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Win.cfg
index cb40d365..cb40d365 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/lineEndings-to-Win.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/lineEndings-to-Win.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/long_br_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_br_cmt.cfg
index f66ee7c7..f66ee7c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/long_br_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_br_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/long_namespace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_namespace.cfg
index 74f99a18..74f99a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/long_namespace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/long_namespace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mda_space_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_a.cfg
index b05558b7..b05558b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mda_space_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mda_space_c.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_c.cfg
index 9bfcef37..9bfcef37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mda_space_c.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mda_space_c.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/misc-failures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/misc-failures.cfg
index 36b9e694..36b9e694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/misc-failures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/misc-failures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod-paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren.cfg
index 2c0049ab..2c0049ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod-paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod-paren2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren2.cfg
index 113ee868..113ee868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod-paren2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod-paren2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_add_long_class_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_class_closebrace_comment-1.cfg
index c1e8e0ac..c1e8e0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_add_long_class_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_class_closebrace_comment-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_add_long_namespace_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_namespace_closebrace_comment-1.cfg
index a94f5a62..a94f5a62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_add_long_namespace_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_add_long_namespace_closebrace_comment-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_case_brace_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_add.cfg
index bfcca51a..bfcca51a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_case_brace_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_case_brace_rm.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_rm.cfg
index 51252b69..51252b69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_case_brace_rm.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_case_brace_rm.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_function-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_function-f.cfg
index 8d44cc3b..8d44cc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_function-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_function-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_if_chain-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain-t.cfg
index 32a552ec..32a552ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_if_chain-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_if_chain_only-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain_only-t.cfg
index ec61c84b..ec61c84b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_if_chain_only-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_if_chain_only-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg
index c187d46a..c187d46a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg
index 800ba158..800ba158 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_brace_nl_block_rem_mlcond-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_paren_if_bool.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_paren_if_bool.cfg
index f75f8801..f75f8801 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_full_paren_if_bool.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_full_paren_if_bool.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_move_case_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_move_case_brace.cfg
index acb25734..acb25734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_move_case_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_move_case_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_paren_on_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-a.cfg
index 6e5a38ec..6e5a38ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_paren_on_return-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_paren_on_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-r.cfg
index fb547f72..fb547f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_paren_on_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_paren_on_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_remove_empty_return-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_empty_return-t.cfg
index 3e1bcd1f..3e1bcd1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_remove_empty_return-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_empty_return-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_remove_extra_semicolon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_extra_semicolon-t.cfg
index 0f2d5246..0f2d5246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_remove_extra_semicolon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_remove_extra_semicolon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_grouping_enabled.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_grouping_enabled.cfg
index d88bf262..d88bf262 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_grouping_enabled.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_grouping_enabled.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_ignore_extension.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_ignore_extension.cfg
index d49491cb..d49491cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_ignore_extension.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_ignore_extension.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_prioritize_angle_over_quotes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
index 475ab734..475ab734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_prioritize_extensionless.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_extensionless.cfg
index aa9eb1db..aa9eb1db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_prioritize_extensionless.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_extensionless.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_prioritize_filename.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_filename.cfg
index 2661a68a..2661a68a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_incl_import_prioritize_filename.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_incl_import_prioritize_filename.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_using-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_using-t.cfg
index 805fc734..805fc734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mod_sort_using-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mod_sort_using-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mono.cfg
index 726b1eda..726b1eda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/mono.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/msg-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/msg-header.h
index 79a0919f..79a0919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/msg-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/msg-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_1.cfg
index fe15ff0a..fe15ff0a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_10.cfg
index e5b917e8..e5b917e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_2.cfg
index b4063fd3..b4063fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_3.cfg
index d1c40d07..d1c40d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_4.cfg
index 651b4823..651b4823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_5.cfg
index 94140b21..94140b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_6.cfg
index 4fd7a077..4fd7a077 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_7.cfg
index 4ee5733c..4ee5733c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_8.cfg
index 5d6d9c63..5d6d9c63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_9.cfg
index be9a43e3..be9a43e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/multi_line_9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/multi_line_9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/my_conf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/my_conf.cfg
index 6bfddbb5..6bfddbb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/my_conf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/my_conf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nSolve.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nSolve.cfg
index 6cc6fc27..6cc6fc27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nSolve.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nSolve.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/negative_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/negative_indent.cfg
index 39b1b007..39b1b007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/negative_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/negative_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nepenthes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nepenthes.cfg
index 150294da..150294da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nepenthes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nepenthes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new-constraint-paren-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new-constraint-paren-space.cfg
index f96e03b6..f96e03b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new-constraint-paren-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new-constraint-paren-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_a.cfg
index d7501092..d7501092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_f.cfg
index 16784899..16784899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_paren_open_close.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_paren_open_close.cfg
index 789c7abe..789c7abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_paren_open_close.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_paren_open_close.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_r.cfg
index b72cd2ae..b72cd2ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/new_op_r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/new_op_r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/newline_after_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/newline_after_endif.cfg
index afd7693d..afd7693d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/newline_after_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/newline_after_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl-brAfter-fcallParen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-brAfter-fcallParen.cfg
index 6a83f800..6a83f800 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl-brAfter-fcallParen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-brAfter-fcallParen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl-comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-comment.cfg
index c6ef78f9..c6ef78f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl-comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl-comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_access_spec.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_access_spec.cfg
index a5d98c44..a5d98c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_access_spec.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_access_spec.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_annotation-f.cfg
index 405f8ef4..405f8ef4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_body-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-2.cfg
index 9c9e7d57..9c9e7d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_body-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_body-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-3.cfg
index 65f1fa5a..65f1fa5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_body-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body.cfg
index 68633b6d..68633b6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_body.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_class_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_class_proto-3.cfg
index 87b84e91..87b84e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_class_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_class_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto-3.cfg
index c9bc1f45..c9bc1f45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_proto_group-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto_group-3.cfg
index 63fa256a..63fa256a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_after_func_proto_group-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_after_func_proto_group-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_assign1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign1.cfg
index 1f4da850..1f4da850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_assign1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_assign2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign2.cfg
index b4cfb4d1..b4cfb4d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_assign2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_assign_leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign_leave_one_liners.cfg
index 6914813b..6914813b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_assign_leave_one_liners.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_assign_leave_one_liners.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_after.cfg
index b80dafa0..b80dafa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_func_body_def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.cfg
index 03ee374a..03ee374a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_func_body_def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_func_body_def-1.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.rerun.cfg
index dc225a1c..dc225a1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_func_body_def-1.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-1.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_func_body_def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-2.cfg
index 2f3ba945..2f3ba945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_func_body_def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_func_body_def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_if_closing_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-f.cfg
index 39539a4e..39539a4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_if_closing_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_if_closing_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-r.cfg
index d3ab2d68..d3ab2d68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_if_closing_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_if_closing_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_return_false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_false.cfg
index 7636745b..7636745b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_return_false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_return_true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_true.cfg
index 1e6976fc..1e6976fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_before_return_true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_before_return_true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_between_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_between_annotation-f.cfg
index 6a67c354..6a67c354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_between_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_between_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_brace-a.cfg
index 25d3c271..25d3c271 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_brace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_brace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-f.cfg
index 0a731344..0a731344 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-r.cfg
index 5a749682..5a749682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_square.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_square.cfg
index e0f11f90..e0f11f90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_square.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_square.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_test.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_test.cfg
index c9faeb04..c9faeb04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_brace_test.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_brace_test.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_class-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-a.cfg
index 8c1eb70e..8c1eb70e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_class-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_class-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-r.cfg
index 29cc4dc6..29cc4dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_class-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_class-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_create_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_create_one_liner.cfg
index ec8b120c..ec8b120c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_create_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_create_one_liner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_ds_struct_enum-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum-2.cfg
index 01c60de4..01c60de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_ds_struct_enum-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_ds_struct_enum_cmt-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum_cmt-t.cfg
index 1864b51d..1864b51d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_ds_struct_enum_cmt-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_ds_struct_enum_cmt-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_endif.cfg
index b056153e..b056153e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.cfg
index b6a28869..b6a28869 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-3.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.rerun.cfg
index f0d3f7b2..f0d3f7b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-3.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-3.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-4.cfg
index 70973ec8..70973ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-a.cfg
index 66e7dbfa..66e7dbfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_enum_own_lines-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_enum_own_lines-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
index 7aac9635..7aac9635 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-f.cfg
index 7f08f9e3..7f08f9e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-fr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-fr.cfg
index affe7156..affe7156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-fr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-fr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-r.cfg
index e64f7f0c..e64f7f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-rf.cfg
index 9b12913e..9b12913e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_fdef_brace_cond-rf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_fdef_brace_cond-rf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_for_leave_one_liners-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-f.cfg
index bdcceefd..bdcceefd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_for_leave_one_liners-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_for_leave_one_liners-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-t.cfg
index 4d11891e..4d11891e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_for_leave_one_liners-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_for_leave_one_liners-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_args_multi_line_ignore_closures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_args_multi_line_ignore_closures.cfg
index e480140e..e480140e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_args_multi_line_ignore_closures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_args_multi_line_ignore_closures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_empty-r.cfg
index da04d6fa..da04d6fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren-f.cfg
index 480ce89f..480ce89f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren_empty-r.cfg
index 48612eb5..48612eb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_call_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_call_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_class_scope-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_class_scope-a.cfg
index dc9b2ec5..dc9b2ec5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_class_scope-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_class_scope-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_decl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_1.cfg
index 438afe8f..438afe8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_decl_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_decl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_2.cfg
index 16d47b04..c0495a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_decl_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_decl_2.cfg
@@ -15,3 +15,9 @@ nl_max_blank_in_func            = 3 # this option limits nl_inside_empty_func to
 sp_after_comma                  = force
 sp_inside_fparen                = force
 align_func_params               = true
+
+# test nl_inside_empty_func option with code width constraints and
+# 'eat_blanks_before_close_brace' and 'eat_blanks_after_open_brace' set to true
+eat_blanks_after_open_brace     = true
+eat_blanks_before_close_brace   = true
+code_width                      = 25
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_def_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_def_paren_empty-r.cfg
index ddc5e5d2..ddc5e5d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_def_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_def_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_paren_empty.cfg
index 63f0b8ad..63f0b8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_scope_name-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_scope_name-a.cfg
index c814477d..c814477d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_scope_name-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_scope_name-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name-r.cfg
index 9cc10873..9cc10873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_class.cfg
index fcb08501..fcb08501 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_force.cfg
index ef8b317e..ef8b317e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_mixed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_mixed.cfg
index 515400f2..515400f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_mixed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_mixed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_remove.cfg
index ee38dd7e..ee38dd7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_type_name_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_type_name_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_var_def_blk-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_var_def_blk-1.cfg
index 2fc79eb3..2fc79eb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_func_var_def_blk-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_func_var_def_blk-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_inside_namespace_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_1.cfg
index c84309ca..c84309ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_inside_namespace_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_inside_namespace_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_2.cfg
index 9edefd02..9edefd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_inside_namespace_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_inside_namespace_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_max_blank_in_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-1.cfg
index 9aa3416c..9aa3416c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_max_blank_in_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_max_blank_in_func-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-4.cfg
index 8d0bdf67..8d0bdf67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_max_blank_in_func-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_max_blank_in_func-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_namespace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-a.cfg
index bc5d6469..bc5d6469 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_namespace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_namespace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-r.cfg
index ca9c198d..ca9c198d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_namespace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_namespace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_oc_block_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_oc_block_brace-f.cfg
index 824fc747..824fc747 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_oc_block_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_oc_block_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_remove_extra_newlines-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_remove_extra_newlines-1.cfg
index 2d0c48b2..2d0c48b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_remove_extra_newlines-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_remove_extra_newlines-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_semicolon.cfg
index d099e0c7..d099e0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_template-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-f.cfg
index dafe1c9d..dafe1c9d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_template-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_template-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-r.cfg
index 6220a8db..6220a8db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_template-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_template-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_try-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_try-a.cfg
index b85fcb08..b85fcb08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_try-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_try-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-f.cfg
index 1b29c5cd..1b29c5cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-r.cfg
new file mode 100644
index 00000000..ef8d1de1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst-r.cfg
@@ -0,0 +1,2 @@
+nl_type_brace_init_lst = remove
+sp_after_decltype      = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-f.cfg
index 4e070657..4e070657 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-r.cfg
index d4834efd..d4834efd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-f.cfg
index 1e9289e4..1e9289e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-r.cfg
index 7d493c8b..7d493c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_whole_file_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_whole_file_ifdef.cfg
index 1d6a585a..1d6a585a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/nl_whole_file_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/nl_whole_file_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/no_squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/no_squeeze_ifdef.cfg
index af4a3020..af4a3020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/no_squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/no_squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/obj-c-available.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-available.cfg
index f77790fc..f77790fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/obj-c-available.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-available.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/obj-c-properties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-properties.cfg
index 98241779..98241779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/obj-c-properties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/obj-c-properties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/objc_bug_497.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_bug_497.cfg
index 0015f97d..0015f97d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/objc_bug_497.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_bug_497.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/objc_complex_method.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_complex_method.cfg
index 3e713117..3e713117 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/objc_complex_method.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/objc_complex_method.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc1.cfg
index 659131cf..659131cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc10.cfg
index d50a20d8..d50a20d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc11.cfg
index e355d765..e355d765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc12.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc12.cfg
index 4f069fed..4f069fed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc12.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc12.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc13.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc13.cfg
index 925a2739..925a2739 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc13.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc13.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc14.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc14.cfg
index a44950db..a44950db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc14.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc14.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc16.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc16.cfg
index 5eec46e9..5eec46e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc16.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc16.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc17.cfg
index 18b27823..18b27823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc18.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc18.cfg
index 96003cf5..96003cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc18.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc18.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc19.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc19.cfg
index d68c95f0..d68c95f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc19.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc19.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc2.cfg
index 43d02a66..43d02a66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc4.cfg
index f2de050e..f2de050e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc5.cfg
index 77a7a7af..77a7a7af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc6.cfg
index c1bcd8d4..c1bcd8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc7.cfg
index 972ab19a..972ab19a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc8.cfg
index 3f577ab8..3f577ab8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc9.cfg
index 92ed39d4..92ed39d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc_bug_1674.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1674.cfg
index 31e4537c..31e4537c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc_bug_1674.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1674.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc_bug_1683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1683.cfg
index b5d4249d..b5d4249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc_bug_1683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_bug_1683.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_cond_colon.cfg
index b86516e0..b86516e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/oc_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/oc_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-force.cfg
index fb2b90ad..fb2b90ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-remove-align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-1.cfg
index ceebcf9e..ceebcf9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-remove-align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-remove-align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-2.cfg
index f7fb60f3..f7fb60f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-remove-align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove-align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove.cfg
index 5c034f26..5c034f26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op-space-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op-space-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op_sym_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op_sym_empty.cfg
index d9a57ce1..d9a57ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/op_sym_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/op_sym_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/out-668-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-F.cfg
index 77d9e08c..77d9e08c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/out-668-F.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-F.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/out-668-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-T.cfg
index a48c3ebb..a48c3ebb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/out-668-T.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/out-668-T.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pascal_ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pascal_ptr.cfg
index 2da7f0ae..2da7f0ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pascal_ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pascal_ptr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pawn-escape.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn-escape.cfg
index 8d10ec23..8d10ec23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pawn-escape.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn-escape.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pawn.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn.cfg
index 53858314..53858314 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pawn.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pawn.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_comma-lf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-lf.cfg
index 9f2daab6..9f2daab6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_comma-lf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-lf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_comma-tb.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-tb.cfg
index 3530982a..3530982a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_comma-tb.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_comma-tb.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_compare-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-eol.cfg
index 90267209..90267209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_compare-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_compare-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-sol.cfg
index a4235d7d..a4235d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_compare-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_compare-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_conditional-l.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-l.cfg
index 11eb46fd..11eb46fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_conditional-l.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-l.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_conditional-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-t.cfg
index 79bb52d0..79bb52d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_conditional-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_conditional-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_enum_comma-tf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_enum_comma-tf.cfg
index 26cf3dff..26cf3dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_enum_comma-tf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_enum_comma-tf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_shift-join.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-join.cfg
index 69ce2c94..69ce2c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_shift-join.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-join.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_shift-lead.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-lead.cfg
index 08e7d5de..08e7d5de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_shift-lead.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-lead.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_shift-trail.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-trail.cfg
index a6b45298..a6b45298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pos_shift-trail.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pos_shift-trail.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp-indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-indent-2.cfg
index 64f53643..64f53643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp-indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp-pragma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-pragma.cfg
index e143a69c..e143a69c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp-pragma.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-pragma.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-space.cfg
index e91685ab..e91685ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_define_at_level-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_define_at_level-1.cfg
index 12d12161..12d12161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_define_at_level-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_define_at_level-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-0.cfg
index 82f11f27..82f11f27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-1.cfg
index 7c01e819..7c01e819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-2.cfg
index 0b9cb408..6f912806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-2.cfg
@@ -2,4 +2,4 @@
 indent_columns                  = 4
 pp_indent                       = add
 pp_indent_at_level              = true
-pp_indent_if                    = -4
\ No newline at end of file
+pp_indent_if                    = -4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-3.cfg
index 4b876498..4b876498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-4.cfg
index fe29f734..fe29f734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_if_indent-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_if_indent-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_indent-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_indent-a.cfg
index f9f9b3b3..f9f9b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_indent-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_indent-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_multi_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_multi_comment.cfg
index 0c23b380..0c23b380 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_multi_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_multi_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_ret.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_ret.cfg
index b1fb2000..b1fb2000 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/pp_ret.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/pp_ret.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/preproc-cleanup.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/preproc-cleanup.cfg
index 3bd31722..3bd31722 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/preproc-cleanup.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/preproc-cleanup.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr-arith.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr-arith.cfg
index 2aeab486..2aeab486 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr-arith.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr-arith.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr_star-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-1.cfg
index cde1e26b..cde1e26b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr_star-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr_star-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-2.cfg
index 36e38d4e..36e38d4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr_star-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr_star-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-3.cfg
index cbfef35f..cbfef35f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ptr_star-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ptr_star-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/qt-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/qt-1.cfg
index b15663f7..b15663f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/qt-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/qt-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/rdan.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/rdan.cfg
index b000b33d..b000b33d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/rdan.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/rdan.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/reflow_fold_regex.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/reflow_fold_regex.txt
new file mode 100644
index 00000000..9a24626f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/reflow_fold_regex.txt
@@ -0,0 +1,4 @@
+end_of_prev_line_regex[0] = "(?:[\w,\]\)]|\.\.\.|;|\})$"
+beg_of_next_line_regex[0] = "^(?:[\w,\[\(]|\.\.\.|\{)"
+end_of_prev_line_regex[1] = "[^\.]\.$"
+beg_of_next_line_regex[1] = "^[A-Z]"
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-0.cfg
index a837d86f..a837d86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-1.cfg
index 48ae77f3..48ae77f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-2.cfg
index 5beed445..5beed445 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-3.cfg
index 30a01c96..30a01c96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/region-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/region-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-1.cfg
index 996ca632..996ca632 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-2.cfg
index 87b361d8..87b361d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-3.cfg
index 9caf1a7e..9caf1a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-4.cfg
index 9a885287..9a885287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/return-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/return-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sef.cfg
index ee467d79..ee467d79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf.2886991-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-f.cfg
index 46a15bac..46a15bac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf.2886991-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf.2886991-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-r.cfg
index 8f6c0f6d..8f6c0f6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf.2886991-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.2886991-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf.3315874.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.3315874.cfg
index 68abb2a3..68abb2a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf.3315874.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf.3315874.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf537.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf537.cfg
index 400c7e0b..400c7e0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf537.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf537.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf538.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf538.cfg
index 8c6d149b..8c6d149b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf538.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf538.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf574.cfg
index 8fc266f7..8fc266f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf607.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf607.cfg
index ac5c0069..ac5c0069 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sf607.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sf607.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sim.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sim.cfg
index d92fba11..d92fba11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sim.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sim.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sort_imports.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_imports.cfg
index 655a684f..655a684f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sort_imports.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_imports.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sort_using_categ.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_using_categ.cfg
index bf7f26e6..bf7f26e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sort_using_categ.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sort_using_categ.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_angle-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-1.cfg
index cae5bbb7..cae5bbb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_angle-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_angle-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-2.cfg
index c14d7901..c14d7901 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_angle-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_angle-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-3.cfg
index d0428a10..d0428a10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_angle-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_angle-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_cast-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-f.cfg
index d92ffb0d..d92ffb0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_cast-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_cast-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-r.cfg
index 130602eb..130602eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_cast-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast.cfg
index c16cc978..c16cc978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_comma-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_comma-a.cfg
index 3f67ae0e..3f67ae0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_comma-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_comma-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_constr_colon.cfg
index aa1189dd..aa1189dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-f.cfg
new file mode 100644
index 00000000..077c5f94
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-f.cfg
@@ -0,0 +1,3 @@
+indent_off_after_return     = true
+indent_off_after_return_new = false
+sp_after_decltype           = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_decltype-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-r.cfg
index 64a318a0..64a318a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_decltype-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_decltype-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_for_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_for_colon.cfg
index 70b19e50..70b19e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_for_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_for_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_at_sel_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_add.cfg
index 817ec7c5..817ec7c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_at_sel_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_at_sel_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_force.cfg
index b2a79b8f..b2a79b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_at_sel_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_at_sel_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_remove.cfg
index 98b6de42..98b6de42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_at_sel_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_at_sel_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_block_caret_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_add.cfg
index 56e22330..56e22330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_block_caret_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_force.cfg
index 516271f1..516271f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_block_caret_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_return_type_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_add.cfg
index b321b9aa..b321b9aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_return_type_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_return_type_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_force.cfg
index fb8b9a1b..fb8b9a1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_return_type_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_return_type_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_remove.cfg
index 1110a1eb..1110a1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_oc_return_type_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_oc_return_type_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_ptr_star_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_ptr_star_qualifier-f.cfg
index 7e26046f..7e26046f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_ptr_star_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_ptr_star_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_send_oc_colon-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_send_oc_colon-f.cfg
index 2a54dd6f..2a54dd6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_send_oc_colon-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_send_oc_colon-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_sparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_sparen.cfg
index c9b9afbf..c9b9afbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_sparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_sparen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_throw_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_throw_remove.cfg
index 6b6bc0ac..6b6bc0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_throw_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_throw_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-a.cfg
index da7a3edb..da7a3edb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-f.cfg
new file mode 100644
index 00000000..b7fa74f4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-f.cfg
@@ -0,0 +1,2 @@
+sp_after_type     = force
+sp_after_decltype = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-i.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-r.cfg
new file mode 100644
index 00000000..78a64119
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type-r.cfg
@@ -0,0 +1,2 @@
+sp_after_type     = remove
+sp_after_decltype = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-f.cfg
index d3b744b4..d3b744b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-r.cfg
index f370b82e..f370b82e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_after_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_after_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_angle_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_colon.cfg
index e247bbbe..e247bbbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_angle_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_angle_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren-f.cfg
index 0b3d2f92..0b3d2f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_angle_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_angle_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren_empty.cfg
index 1e3c592b..1e3c592b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_angle_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_angle_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-a.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-f.cfg
index 6cd2b6b0..6cd2b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith_additive-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-f.cfg
index 8e6f0585..8e6f0585 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith_additive-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith_additive-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-r.cfg
index e01e86f7..e01e86f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_arith_additive-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_arith_additive-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_assign-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign-a.cfg
index 78ee09f5..78ee09f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_assign-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign_default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign_default.cfg
new file mode 100644
index 00000000..29411834
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_assign_default.cfg
@@ -0,0 +1 @@
+sp_assign_default = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_balance_nested_parens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_balance_nested_parens.cfg
index 8e9dbb6f..8e9dbb6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_balance_nested_parens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_balance_nested_parens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref-r.cfg
index cf8228ab..cf8228ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_byref-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_byref_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref_func.cfg
index 6f5e2783..6f5e2783 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_byref_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_byref_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_comma-f.cfg
index dc25e313..dc25e313 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_comma-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_comma-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_constr_colon.cfg
index 9d0ec317..9d0ec317 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-f.cfg
index 07527d5f..07527d5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-r.cfg
index faec4b72..faec4b72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_force.cfg
index 727fcf06..727fcf06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_block_caret_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_remove.cfg
index 37c6104a..37c6104a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_block_caret_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_block_caret_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_proto_list_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_add.cfg
index 3374e228..3374e228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_proto_list_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_proto_list_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_force.cfg
index 5be78fac..5be78fac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_proto_list_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_proto_list_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_remove.cfg
index 9f93f4a5..9f93f4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_oc_proto_list_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_oc_proto_list_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-f.cfg
index 7653ec0b..7653ec0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ptr_star-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-r.cfg
index 55f99c73..55f99c73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_ptr_star-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_ptr_star-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_tr_emb_cmt-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-a.cfg
index b2391821..b2391821 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_tr_emb_cmt-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_tr_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-f.cfg
index c0e72b53..c0e72b53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_tr_emb_cmt-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_tr_emb_cmt-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-f.cfg
index 3dda0281..3dda0281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-r.cfg
index 5fb0bf36..5fb0bf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_before_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_before_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_between_new_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_between_new_paren.cfg
index 0a338bd2..0a338bd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_between_new_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_between_new_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument.cfg
index 60c651fb..60c651fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument2.cfg
index 8f297d7d..8f297d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument3.cfg
index 17059e47..17059e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument4.cfg
index 8caf60bc..8caf60bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument5.cfg
index 42e8c380..42e8c380 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_block_as_argument5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_block_as_argument5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_bool-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-f.cfg
index 84c0238e..84c0238e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_bool-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_bool-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-r.cfg
index 0bce4fb0..0bce4fb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_bool-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_bool-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_brace_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-f.cfg
index 465ee3cd..465ee3cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_brace_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_brace_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-r.cfg
index 73e4d429..73e4d429 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_brace_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_catch.cfg
new file mode 100644
index 00000000..7ee0209d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_brace_catch.cfg
@@ -0,0 +1 @@
+sp_brace_catch = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_catch_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_catch_brace.cfg
index d2da6d91..d2da6d91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_catch_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_catch_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt.cfg
index fb7f6ef1..fb7f6ef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-f.cfg
new file mode 100644
index 00000000..1c626401
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-f.cfg
@@ -0,0 +1,2 @@
+sp_cmt_cpp_start                = remove
+sp_cmt_cpp_region               = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-r.cfg
new file mode 100644
index 00000000..67a0ff11
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_region-r.cfg
@@ -0,0 +1,2 @@
+sp_cmt_cpp_start                = force
+sp_cmt_cpp_region               = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt_cpp_start-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-a.cfg
index d7e6adf1..d7e6adf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt_cpp_start-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt_cpp_start-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-r.cfg
index 13ceebfc..13ceebfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt_cpp_start-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt_cpp_start_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start_force.cfg
index e87c9b0d..e87c9b0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cmt_cpp_start_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cmt_cpp_start_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cond_colon.cfg
index d39afa14..d39afa14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cparen_oparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-f.cfg
index c2af4d15..c2af4d15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cparen_oparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cparen_oparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-r.cfg
index f584c02d..f584c02d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cparen_oparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cparen_oparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-f.cfg
index f45270e7..f45270e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-r.cfg
index c64da54c..c64da54c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-f.cfg
index 8dc95ae1..8dc95ae1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_paren_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-r.cfg
index 8875383e..8875383e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_paren_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_paren_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-f.cfg
index baea51dd..baea51dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-r.cfg
index 703f0bcc..703f0bcc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-f.cfg
index 93609c5e..93609c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-r.cfg
index e1e00b21..e1e00b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_cpp_lambda_square_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_cpp_lambda_square_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_dc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_dc.cfg
index c9b14cc2..c9b14cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_dc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_dc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_decltype_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-f.cfg
index 3636cd02..3636cd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_decltype_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_decltype_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-r.cfg
index b11add96..b11add96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_decltype_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_decltype_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon-r.cfg
new file mode 100644
index 00000000..87f44474
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon-r.cfg
@@ -0,0 +1 @@
+sp_enum_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon.cfg
new file mode 100644
index 00000000..27716eca
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_colon.cfg
@@ -0,0 +1 @@
+sp_enum_colon = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_enum_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_paren-r.cfg
index f155e201..f155e201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_enum_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_enum_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_call_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_empty.cfg
index 0848c080..0848c080 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_call_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_paren.cfg
new file mode 100644
index 00000000..c5f8927b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_paren.cfg
@@ -0,0 +1,5 @@
+macro-open         BEGIN_MESSAGE_MAP
+macro-close        END_MESSAGE_MAP
+sp_after_comma     = force
+indent_columns     = 3
+sp_func_call_paren = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_call_user_inside_fparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_user_inside_fparen.cfg
index e5650760..e5650760 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_call_user_inside_fparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_call_user_inside_fparen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_class_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_class_empty.cfg
index 252b598b..252b598b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_class_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_class_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_def_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_def_empty.cfg
index 688918b1..688918b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_def_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_def_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_proto_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_proto_empty.cfg
index b0601328..b0601328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_func_proto_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_func_proto_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_braces_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_braces_empty-r.cfg
index f7b1b239..f7b1b239 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_braces_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_braces_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-f.cfg
index 2b159a36..2b159a36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-r.cfg
index 98f867f4..98f867f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_fparens-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparens-f.cfg
index b56756d1..b56756d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_fparens-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_fparens-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-f.cfg
index 63de9668..63de9668 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-r.cfg
index b0881eaf..b0881eaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_inside_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_inside_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_boxed.cfg
index 73939de1..73939de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_catch.cfg
index 7367541a..7367541a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_catch.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_catch.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_classname_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_classname_paren-r.cfg
index ba92279e..ba92279e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_classname_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_classname_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_synchronized.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_synchronized.cfg
index 5056f70f..5056f70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_oc_synchronized.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_oc_synchronized.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_comma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_comma.cfg
new file mode 100644
index 00000000..f54ca437
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_comma.cfg
@@ -0,0 +1,5 @@
+# Add or remove space between an open paren and comma: '(,' vs. '( ,'. Default=Force.
+sp_paren_comma = remove
+
+# should not be used
+sp_before_comma = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-f.cfg
index a9662d76..a9662d76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-r.cfg
index 4d547370..4d547370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_noexcept-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_noexcept-f.cfg
index 35e76a33..35e76a33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_noexcept-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_noexcept-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_qualifier-f.cfg
index f91f2aee..f91f2aee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_paren_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_paren_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-f.cfg
index bdea1673..bdea1673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-r.cfg
index a2541527..a2541527 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-f.cfg
index 11637ca1..11637ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-r.cfg
index 8fbef0b8..8fbef0b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_return_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_return_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-f.cfg
index 743b18f6..743b18f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-r.cfg
index e54a000c..e54a000c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-f.cfg
index 43cffee2..43cffee2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-r.cfg
index ae307eac..ae307eac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_sizeof_ellipsis_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_sizeof_ellipsis_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_skip_vbrace_tokens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_skip_vbrace_tokens.cfg
index d5ce739d..d5ce739d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_skip_vbrace_tokens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_skip_vbrace_tokens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_this_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_this_paren.cfg
index fc80bb28..fc80bb28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_this_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_this_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_throw_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-f.cfg
index 611cd750..611cd750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_throw_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_throw_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-r.cfg
index 893c8782..893c8782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_throw_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_throw_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_trailing_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-f.cfg
index 9e1fe074..9e1fe074 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_trailing_return-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_trailing_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-r.cfg
index b26929ba..b26929ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_trailing_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_trailing_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-f.cfg
index 2f0d5258..2f0d5258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-r.cfg
index 199dc1eb..199dc1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-f.cfg
index d16265f5..d16265f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-r.cfg
index a68216c9..a68216c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-1.cfg
index 010876e0..010876e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-2.cfg
index de86218b..de86218b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-f.cfg
index bf878d19..bf878d19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-r.cfg
index aec00124..aec00124 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_type_func-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_type_func-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_word_brace_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_force.cfg
index d9c53345..d9c53345 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_word_brace_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_word_brace_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_remove.cfg
index 3fd1fa26..3fd1fa26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/sp_word_brace_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/sp_word_brace_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/space_indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_class-t_columns-4.cfg
index a454237c..a454237c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/space_indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/space_indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-3.cfg
index ec130371..ec130371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/space_indent_columns-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/space_indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-4.cfg
index f05c685f..f05c685f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/space_indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/space_indent_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/squeeze-paren-close-Option.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze-paren-close-Option.cfg
index 9d4a4f70..9d4a4f70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/squeeze-paren-close-Option.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze-paren-close-Option.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef.cfg
index fa3f980c..fa3f980c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/squeeze_ifdef_top.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef_top.cfg
index 6b45f49a..6b45f49a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/squeeze_ifdef_top.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/squeeze_ifdef_top.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/star_pos-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-0.cfg
index 6798b186..6798b186 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/star_pos-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/star_pos-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-1.cfg
index 6c9f5806..6c9f5806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/star_pos-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/star_pos-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-2.cfg
index dc1f45fc..dc1f45fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/star_pos-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/star_pos-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/string_replace_tab_chars-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/string_replace_tab_chars-t.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/string_replace_tab_chars-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/string_replace_tab_chars-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/tab-0-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tab-0-11.cfg
index 96f745a3..96f745a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/tab-0-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tab-0-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/tcf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tcf.cfg
index dd7fa193..dd7fa193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/tcf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/tcf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/template_angles.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_angles.cfg
index 14680e53..14680e53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/template_angles.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_angles.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/template_sp-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-force.cfg
index d36e014a..d36e014a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/template_sp-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/template_sp-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-remove.cfg
index e950e113..e950e113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/template_sp-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/template_sp-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ternary_short.cfg
index 55e708cf..55e708cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/ternary_short.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/ternary_short.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/toggle_processing_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt.cfg
index 08ef987e..08ef987e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/toggle_processing_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/toggle_processing_cmt2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt2.cfg
index 0b9be532..0b9be532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/toggle_processing_cmt2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt3.cfg
new file mode 100644
index 00000000..d7f1f675
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt3.cfg
@@ -0,0 +1,8 @@
+cmt_indent_multi = true
+cmt_reflow_mode = 2
+cmt_sp_after_star_cont = 1
+cmt_star_cont=true
+cmt_width = 70
+disable_processing_cmt="\\\\verbatim|[ \t]*(?:\\*INDENT-OFF\\*|\\*\\*ABC\\*\\*)"
+enable_processing_cmt="\\\\endverbatim|[ \t]*(?:\\*INDENT-ON\\*|\\?\\?DEF\\?\\?)"
+processing_cmt_as_regex=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt4.cfg
new file mode 100644
index 00000000..ccd7bb03
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/toggle_processing_cmt4.cfg
@@ -0,0 +1,6 @@
+cmt_sp_after_star_cont = 1
+cmt_width = 70
+disable_processing_cmt="\\\\verbatim|[ \t]*(?:\\*INDENT-OFF\\*|\\*\\*ABC\\*\\*)"
+enable_processing_cmt="\\\\endverbatim|[ \t]*(?:\\*INDENT-ON\\*|\\?\\?DEF\\?\\?)"
+processing_cmt_as_regex=true
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/type_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/type_wrap.cfg
index eeea5786..eeea5786 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/type_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/type_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/var_def_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/var_def_gap.cfg
index 3d77d117..3d77d117 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/var_def_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/var_def_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/verbatim_strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/verbatim_strings.cfg
index 65e1756d..65e1756d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/verbatim_strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/verbatim_strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/wessex.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/wessex.cfg
index 77fc3303..77fc3303 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/wessex.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/wessex.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.cfg
index 6c18a158..6c18a158 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width-2.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.rerun.cfg
index c74e4020..c74e4020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width-2.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-2.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-3.cfg
index 843f6669..843f6669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width.cfg
index 10cb731c..10cb731c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/width.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/width.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/xml-str.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/xml-str.cfg
index bd667ab4..bd667ab4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/config/xml-str.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/config/xml-str.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cpp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cpp.test
index d2643835..84bbaa0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/cpp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/cpp.test
@@ -68,6 +68,7 @@
 30057  nl_inside_namespace_1.cfg            cpp/nl_inside_namespace.cpp
 30058  nl_inside_namespace_2.cfg            cpp/nl_inside_namespace.cpp
 30059  Issue_2186.cfg                       cpp/Issue_2186.cpp
+
 30060  Issue_1734.cfg                       cpp/Issue_1734.cpp
 
 # Class colon positioning
@@ -129,7 +130,7 @@
 30111  indent_columns-4.cfg                 cpp/bug_1346.h
 30112  bug_1432.cfg                         cpp/bug_1432.cpp
 30113  bug_1452.cfg                         cpp/bug_1452.cpp
-30114  empty.cfg                            cpp/bug_1462.cpp
+30114  template_sp-remove.cfg               cpp/bug_1462.cpp
 30115  empty.cfg                            cpp/Issue_1704.cpp
 30116  Issue_1052.cfg                       cpp/Issue_1052.cpp
 30117  Issue_2343.cfg                       cpp/Issue_2343.cpp
@@ -148,6 +149,8 @@
 30129  Issue_2890.cfg                       cpp/Issue_2890.cpp
 
 30130  brace-allman.cfg                     cpp/if-constexpr.cpp
+30131  Issue_3010.cfg                       cpp/Issue_3010.cpp
+30132  sp_brace_catch.cfg                   cpp/sp_brace_catch.cpp
 
 30200  bug_1862.cfg                         cpp/bug_1862.cpp
 30201  cmt_indent-1.cfg                     cpp/cmt_indent.cpp
@@ -173,6 +176,9 @@
 
 30220  bug_1340.cfg                         cpp/bug_1340.cpp
 30221  Issue_2914.cfg                       cpp/Issue_2914.cpp
+30222  sp_assign_default.cfg                cpp/trailing_return.cpp
+30223  sp_enum_colon.cfg                    cpp/sp_enum_colon.cpp
+30224  sp_enum_colon-r.cfg                  cpp/sp_enum_colon.cpp
 
 30230  sp_type_func-r.cfg                   cpp/sp_type_func.cpp
 30231  sp_type_func-f.cfg                   cpp/sp_type_func.cpp
@@ -210,6 +216,7 @@
 30265  long_br_cmt.cfg                      cpp/long_br_cmt.cpp
 30266  Issue_2921.cfg                       cpp/Issue_2921.cpp
 30267  Issue_2930.cfg                       cpp/Issue_2930.cpp
+30268  Issue_2692.cfg                       cpp/Issue_3018.cpp
 
 30270  const_throw.cfg                      cpp/const_throw.cpp
 30271  sp_throw_paren-r.cfg                 cpp/sp_throw_paren.cpp
@@ -246,6 +253,7 @@
 30316  Issue_2428.cfg                       cpp/Issue_2428.cpp
 30317  pos_comma-tb.cfg                     cpp/braced_init_template_decltype.cpp
 30318  Issue_2949.cfg                       cpp/Issue_2949.cpp
+30319  Issue_2886.cfg                       cpp/Issue_2886.cpp
 
 30320  sp_return_paren-r.cfg                cpp/returns.cpp
 30321  sp_return_paren-f.cfg                cpp/returns.cpp
@@ -253,8 +261,12 @@
 30323  sp_return_brace-f.cfg                cpp/returns.cpp
 30324  mod_paren_on_return-a.cfg            cpp/returns.cpp
 30325  mod_paren_on_return-r.cfg            cpp/returns.cpp
-
 30326  indent_off_after_return.cfg          cpp/indent_off_after_return.cpp
+30327  indent_off_after_return.cfg          cpp/indent_off_after_return.cpp
+30328  nl_type_brace_init_lst-f.cfg         cpp/call_brace_init_lst.cpp
+30329  nl_type_brace_init_lst-r.cfg         cpp/call_brace_init_lst.cpp
+
+30330  Issue_3080.cfg                       cpp/Issue_3080.cpp
 
 30400  attribute_specifier_seqs.cfg         cpp/attribute_specifier_seqs.cpp
 30401  Issue_2570.cfg                       cpp/Issue_2570.cpp
@@ -299,6 +311,9 @@
 30754  indent_with_tabs-0.cfg               cpp/bug_i_682.h
 30755  empty.cfg                            cpp/bug_i_938.h
 30756  bug_1296.cfg                         cpp/bug_1296.cpp
+30757  Issue_3054.cfg                       cpp/Issue_3054.cpp
+30758  Issue_3054-2.cfg                     cpp/Issue_3054-2.cpp
+
 30761  out-668-F.cfg                        cpp/out-668.cpp
 30762  out-668-T.cfg                        cpp/out-668.cpp
 30763  Issue_2166.cfg                       cpp/Issue_2166.cpp
@@ -314,6 +329,7 @@
 30777 sp_cpp_lambda_fparen-f.cfg            cpp/sp_cpp_lambda_fparen.cpp
 
 30780 lambda_in_one_liner.cfg               cpp/lambda_in_one_liner.cpp
+30781 lambda_in_one_liner.cfg               cpp/lambda_brace_list.cpp
 
 30790 Issue_2795.cfg                        cpp/Issue_2795.cpp
 
@@ -366,6 +382,8 @@
 30853  sp_paren_noexcept-f.cfg              cpp/noexcept.cpp
 30854  Issue_1703.cfg                       cpp/Issue_1703.cpp
 30855  empty.cfg                            cpp/cpp_move.cpp
+30856  sp_cmt_cpp_region-f.cfg              cpp/sp_cmt_cpp_region.cpp
+30857  sp_cmt_cpp_region-r.cfg              cpp/sp_cmt_cpp_region.cpp
 
 30860  sf574.cfg                            cpp/sf574.cpp
 
@@ -381,10 +399,10 @@
 30901  region-1.cfg                         cpp/region.cpp
 30902  region-2.cfg                         cpp/region.cpp
 30903  region-3.cfg                         cpp/region.cpp
-
 30907  Issue_1813.cfg                       cpp/Issue_1813.cpp
 30908  Issue_1813.cfg                       cpp/Issue_1813-2.cpp
 30909  Issue_1813.cfg                       cpp/Issue_1813-3.cpp
+
 30910  indent_namespace-t.cfg               cpp/indent_namespace.h
 30911  indent_class-t.cfg                   cpp/indent_namespace.h
 30912  long_namespace.cfg                   cpp/long_namespace.cpp
@@ -437,13 +455,14 @@
 30955  indent_ctor_init.cfg                 cpp/indent_ctor_init.cpp
 30956  indent_ctor_init_leading.cfg         cpp/indent_ctor_init.cpp
 30957  negative_indent.cfg                  cpp/class-init.cpp
-
 30958  nl_for_leave_one_liners-f.cfg        cpp/nl_for_leave_one_liners.cpp
 30959  nl_for_leave_one_liners-t.cfg        cpp/nl_for_leave_one_liners.cpp
+
 30960  Issue_2151.cfg                       cpp/Issue_2151.cpp
 30961  Issue_2232.cfg                       cpp/Issue_2232.cpp
 30962  nl_assign_leave_one_liners.cfg       cpp/nl_assign_leave_one_liners.cpp
 30963  Issue_2907.cfg                       cpp/Issue_2907.cpp
+30964  Issue_2823.cfg                       cpp/Issue_2823.cpp
 
 30970  Issue_2219.cfg                       cpp/Issue_2219.cpp
 30971  Issue_2224.cfg                       cpp/Issue_2224.cpp
@@ -485,11 +504,11 @@
 31623  sp_after_cast-r.cfg                  cpp/sp_after_type.cpp
 31624  sp_before_ptr_star-f.cfg             cpp/sp_after_type.cpp
 31625  sp_before_ptr_star-r.cfg             cpp/sp_after_type.cpp
-
 31626  sp_decltype_paren-f.cfg              cpp/issue_1916.cpp
 31627  sp_decltype_paren-r.cfg              cpp/issue_1916.cpp
 31628  sp_after_decltype-f.cfg              cpp/issue_1916.cpp
 31629  sp_after_decltype-r.cfg              cpp/issue_1916.cpp
+
 31630  sp_after_type-f.cfg                  cpp/issue_1916.cpp
 31631  sp_after_type-r.cfg                  cpp/issue_1916.cpp
 31632  issue_1916.cfg                       cpp/issue_1916.cpp
@@ -499,9 +518,12 @@
 31636  Issue_1923.cfg                       cpp/Issue_1923.cpp
 
 31660  nl_func_var_def_blk-1.cfg            cpp/issue_1919.cpp
+31661  Issue_3097.cfg                       cpp/Issue_3097.cpp
 
 31700  toggle_processing_cmt.cfg            cpp/toggle_processing_cmt.cpp
 31701  toggle_processing_cmt2.cfg           cpp/toggle_processing_cmt2.cpp
+31702  toggle_processing_cmt3.cfg           cpp/toggle_processing_cmt.cpp
+31703  toggle_processing_cmt4.cfg           cpp/toggle_processing_cmt.cpp
 
 31710  empty.cfg                            cpp/string_replace_tab_chars.cpp
 31711  string_replace_tab_chars-t.cfg       cpp/string_replace_tab_chars.cpp
@@ -510,6 +532,7 @@
 31721  Issue_2689.cfg                       cpp/Issue_2689.cpp
 
 31730  sp_arith-a.cfg                       cpp/ms-style-ref.cpp
+
 31740  empty.cfg                            cpp/I2102.cpp
 
 32000  sp_skip_vbrace_tokens.cfg            cpp/sp_skip_vbrace_tokens.cpp
@@ -519,6 +542,8 @@
 32004  empty.cfg                            cpp/issue_624_angle.cpp
 32005  align_var_class_span-1.cfg           cpp/issue_633_typename.cpp
 32006  space_indent_columns-4.cfg           cpp/bug_i_687.cpp
+32007  Issue_3052.cfg                       cpp/Issue_3052.cpp
+32008  Issue_3034.cfg                       cpp/Issue_3034.cpp
 
 32100  cpp17.cfg                            cpp/cpp17.cpp
 32105  I2103.cfg                            cpp/I2103.cpp
@@ -535,6 +560,7 @@
 33007  empty.cfg                            cpp/NewLine.cpp
 33008  NewLine-r.cfg                        cpp/NewLine.cpp
 33009  NewLine-f.cfg                        cpp/NewLine0.cpp
+
 33010  indent_columns-4.cfg                 cpp/Q_EMIT.cpp
 33011  indent_class-t_columns-4.cfg         cpp/static.h
 33012  kdepim2.cfg                          cpp/Q_SIGNAL_SLOT.cpp
@@ -545,6 +571,7 @@
 33017  bug_1160.cfg                         cpp/bug_1160.cpp
 33018  byref-2.cfg                          cpp/byref-2.cpp
 33019  bug_657.cfg                          cpp/bug_657.cpp
+
 33020  sp_cmt.cfg                           cpp/bug_662.cpp
 33021  bug_633.cfg                          cpp/bug_633.cpp
 33022  empty.cfg                            cpp/bug_634.cpp
@@ -555,6 +582,7 @@
 33027  bug_664.cfg                          cpp/bug_664.cpp
 33028  sp_inside_braces_empty-r.cfg         cpp/braces_empty.cpp
 33029  cast.cfg                             cpp/cast.cpp
+
 33030  space_indent_columns-4.cfg           cpp/Q_FOREVER.cpp
 33031  align_assign_span-1.cfg              cpp/bug_612.cpp
 33032  bug_670.cfg                          cpp/bug_670.cpp
@@ -565,6 +593,7 @@
 33037  func_class.cfg                       cpp/func_class.cpp
 33038  func_class.cfg                       cpp/func_class.h
 33039  mod_remove_empty_return-t.cfg        cpp/mod_remove_empty_return.cpp
+
 33040  nl_after_func_proto_group-3.cfg      cpp/bug_i_411.cpp
 33041  nl_after_func_proto-3.cfg            cpp/bug_i_411.cpp
 33042  nl_after_func_class_proto-3.cfg      cpp/bug_i_411.cpp
@@ -575,6 +604,7 @@
 33047  bug_i_409-create.cfg                 cpp/bug_i_409.cpp
 33048  bug_i_405.cfg                        cpp/bug_i_405.cpp
 33049  pp-pragma.cfg                        cpp/pp-pragma.cpp
+
 33050  empty.cfg                            cpp/issue_523.cpp
 33051  empty.cfg                            cpp/bug_i_503.cpp
 33052  empty.cfg                            cpp/bug_i_512.cpp
@@ -591,6 +621,7 @@
 33063  mod_full_brace_if_chain_only-t.cfg   cpp/if_chain_braces.cpp
 33064  if_chain_braces_2.cfg                cpp/if_chain_braces.cpp
 33069  Issue_2195.cfg                       cpp/Issue_2195.cpp
+
 33070  code_width-70.cfg                    cpp/multi_line.cpp
 33071  multi_line_1.cfg                     cpp/multi_line.cpp
 33072  multi_line_2.cfg                     cpp/multi_line.cpp
@@ -601,6 +632,7 @@
 33077  multi_line_7.cfg                     cpp/multi_line.cpp
 33078  multi_line_8.cfg                     cpp/multi_line.cpp
 33079  multi_line_9.cfg                     cpp/multi_line.cpp
+
 33080  multi_line_10.cfg                    cpp/multi_line.cpp
 33081  space_indent_columns-4.cfg           cpp/bug_i_552.cpp
 33082  empty.cfg                            cpp/namespace_namespace.cpp
@@ -628,9 +660,9 @@
 33102  enum_comma-6.cfg                     cpp/enum_comma.h
 33103  bug_858-f.cfg                        cpp/bug_858.cpp
 33104  bug_858-r.cfg                        cpp/bug_858.cpp
-
 33105  bug_1001.cfg                         cpp/bug_1001.cpp
 33106  bool-pos-eol-force.cfg               cpp/pos_bool_in_template.h
+33107  Issue_2688.cfg                       cpp/Issue_2688.cpp
 33108  Issue_2045.cfg                       cpp/Issue_2045.cpp
 
 33110  enum.cfg                             cpp/enum.cpp
@@ -644,6 +676,8 @@
 33161  sp_before_byref-r.cfg                cpp/byref-3.cpp
 
 33180  pp_multi_comment.cfg                 cpp/pp_multi_comment.cpp
+33181  Issue_2759.cfg                       cpp/Issue_2759.cpp
+33182  Issue_2794.cfg                       cpp/Issue_2794.cpp
 
 33200  cmt_multi_first_len_minimum-1.cfg    cpp/first_len_minimum.cpp
 
@@ -656,10 +690,13 @@
 33211  disable_nl_cont.cfg                  cpp/pp_multi_comment.cpp
 33212  disable_nl_cont.cfg                  cpp/pp-define-indent.cpp
 33213  disable_nl_cont.cfg                  cpp/disable_macro.cpp
+33214  Issue_2742.cfg                       cpp/Issue_2742.cpp
+33215  Issue_3055.cfg                       cpp/Issue_3055.cpp
+33216  Issue_3055.cfg                       cpp/Issue_3055-a.cpp
+33217  empty.cfg                            cpp/Issue_3113.cpp
 
 34001  nl_before_after.cfg                  cpp/nl_before_after.h
 34002  indent_columns-3.cfg                 cpp/bug_i_793.cpp
-
 34003  nl_max_blank_in_func-1.cfg           cpp/nl_max_blank_in_func.cpp
 34004  nl_max_blank_in_func-4.cfg           cpp/nl_max_blank_in_func.cpp
 34005  empty.cfg                            cpp/nl_max_blank_in_func.cpp
@@ -686,7 +723,6 @@
 
 34130  nl_brace_fparen-f.cfg                cpp/bug_i_1000.cpp
 34131  nl_brace_fparen-r.cfg                cpp/bug_i_1000.cpp
-
 34132  new_op_a.cfg                         cpp/new_op.cpp
 34133  new_op_f.cfg                         cpp/new_op.cpp
 34134  new_op_r.cfg                         cpp/new_op.cpp
@@ -698,7 +734,6 @@
 34142  sp_before_byref-r.cfg                cpp/I1112-1.cpp
 34143  I1112-2.cfg                          cpp/I1112-2.cpp
 34144  sp_before_ptr_star-r.cfg             cpp/I1112-3.cpp
-
 34145  i683.cfg                             cpp/i683.cpp
 34146  sp_bool-f.cfg                        cpp/bug_1002.cpp
 34147  sp_bool-r.cfg                        cpp/bug_1002.cpp
@@ -708,34 +743,23 @@
 34150  empty.cfg                            cpp/bug_1032.cpp
 34151  indent_else_if-t.cfg                 cpp/bug_666.cpp
 34152  empty.cfg                            cpp/bug_1068.cpp
-
-
 34153  nl_type_brace_init_lst-f.cfg         cpp/type_brace_init_lst.cpp
 34154  nl_type_brace_init_lst-r.cfg         cpp/type_brace_init_lst.cpp
-
 34155  nl_type_brace_init_lst_open-f.cfg    cpp/type_brace_init_lst.cpp
 34156  nl_type_brace_init_lst_open-r.cfg    cpp/type_brace_init_lst.cpp
-
 34157  nl_type_brace_init_lst_close-f.cfg   cpp/type_brace_init_lst.cpp
 34158  nl_type_brace_init_lst_close-r.cfg   cpp/type_brace_init_lst.cpp
-
-
 34159  sp_type_brace_init_lst-f.cfg         cpp/type_brace_init_lst.cpp
-34160  sp_type_brace_init_lst-r.cfg         cpp/type_brace_init_lst.cpp
 
+34160  sp_type_brace_init_lst-r.cfg         cpp/type_brace_init_lst.cpp
 34161  sp_inside_type_brace_init_lst-f.cfg  cpp/type_brace_init_lst.cpp
 34162  sp_inside_type_brace_init_lst-r.cfg  cpp/type_brace_init_lst.cpp
-
 34163  sp_after_type_brace_init_lst_open-f.cfg  cpp/type_brace_init_lst.cpp
 34164  sp_after_type_brace_init_lst_open-r.cfg  cpp/type_brace_init_lst.cpp
-
 34165  sp_before_type_brace_init_lst_close-f.cfg  cpp/type_brace_init_lst.cpp
 34166  sp_before_type_brace_init_lst_close-r.cfg  cpp/type_brace_init_lst.cpp
-
 34167  nl_func_call_args_multi_line_ignore_closures.cfg cpp/nl_func_call_args_multi_line_ignore_closures.cpp
-
 34168  nl_type_brace_init_lst-r.cfg         cpp/Issue_2910.cpp
-
 34169  sp_inside_fparens-f.cfg              cpp/init-list-call.cpp
 
 34170  empty.cfg                            cpp/i1082.cpp
@@ -745,11 +769,11 @@
 34174  arith-vs-ptr.cfg                     cpp/i1466.cpp
 34175  align_assign_span-1.cfg              cpp/i1509.cpp
 34176  align_assign_span-1.cfg              cpp/i1509_bug_1112_correction.cpp
+34177  sp_func_call_paren.cfg               cpp/sp_func_call_paren.cpp
 
 34180  bug_1402.cfg                         cpp/bug_1402.cpp
 
 34190  bug_1003.cfg                         cpp/bug_1003.cpp
-
 34191  empty.cfg                            cpp/comment-align-multiline.cpp
 34192  mod_remove_extra_semicolon-t.cfg     cpp/i1207.cpp
 34193  empty.cfg                            cpp/i1218.cpp
@@ -763,20 +787,16 @@
 34200  i1536.cfg                            cpp/i1536.cpp
 34201  mod_add_long_namespace_closebrace_comment-1.cfg  cpp/i1565.cpp
 34202  mod_add_long_namespace_closebrace_comment-1.cfg  cpp/i1617.cpp
-
 34203  i1516.cfg                            cpp/i1516.cpp
 34204  align_func_params_span-1.cfg         cpp/func_param_indent_leading_comma.cpp
 34205  bug_1395.cfg                         cpp/bug_1395.cpp
-
 34206  indent_semicolon_for_paren-t.cfg     cpp/for_loop_head.cpp
 34207  indent_first_for_expr-t.cfg          cpp/for_loop_head.cpp
-
 34208  nl_func_type_name-r.cfg              cpp/conversion_operator.cpp
 34209  nl-brAfter-fcallParen.cfg            cpp/lambda_selfcalling.cpp
 
 # TODO: Find relevant test cases for 'override'.
 34210  empty.cfg                            cpp/override_virtual.cpp
-
 34211  anonymous_enum.cfg                   cpp/anonymous_enum.cpp
 
 34250  empty.cfg                            cpp/bug_1607.cpp
@@ -784,18 +804,17 @@
 34252  nl_after_func_proto_group-3.cfg      cpp/issue_2001.cpp
 34253  nl_after_func_proto_group-3.cfg      cpp/friends.cpp
 34254  issue_1985.cfg                       cpp/issue_1985.cpp
+34255  eat_blanks_after_codewidth.cfg       cpp/eat_blanks_after_codewidth.cpp
+34256  Issue_2836.cfg                       cpp/Issue_2836.cpp
 
 34280  UNI-29935.cfg                        cpp/UNI-29935.cpp
 
 34290  sp_type_brace_init_lst-f.cfg         cpp/brace_brace_init_lst.cpp
 34291  sp_type_brace_init_lst-r.cfg         cpp/brace_brace_init_lst.cpp
-
 34292  sp_inside_type_brace_init_lst-f.cfg  cpp/brace_brace_init_lst.cpp
 34293  sp_inside_type_brace_init_lst-r.cfg  cpp/brace_brace_init_lst.cpp
-
 34294  sp_after_type_brace_init_lst_open-f.cfg  cpp/brace_brace_init_lst.cpp
 34295  sp_after_type_brace_init_lst_open-r.cfg  cpp/brace_brace_init_lst.cpp
-
 34296  i1768.cfg                            cpp/i1768.cpp
 34297  align_assign_decl_func-0.cfg         cpp/align-assign-mixed.cpp
 34298  align_assign_decl_func-1.cfg         cpp/align-assign-mixed.cpp
@@ -812,6 +831,7 @@
 34307  2203.cfg                             cpp/2203.cpp
 34308  enum_comment_wrap.cfg                cpp/enum_comment_wrap.cpp
 34309  issue_2209.cfg                       cpp/issue_2209-1.cpp
+
 34310  issue_2209.cfg                       cpp/issue_2209-2.cpp
 34311  Issue_2250.cfg                       cpp/Issue_2250.cpp
 34312  Issue_2101.cfg                       cpp/Issue_2101.cpp
@@ -822,11 +842,32 @@
 34317  align_func_proto_thresh_3.cfg        cpp/align_func_proto_thresh.cpp
 34318  align_assign_func_proto_1.cfg        cpp/align_assign_func_proto.cpp
 34319  align_func_proto_thresh_4.cfg        cpp/align_func_proto_thresh2.cpp
+
 34320  align_func_proto_thresh_5.cfg        cpp/align_func_proto_thresh2.cpp
 34321  bug_2285.cfg                         cpp/bug_2285.cpp
 34322  issue_2623_1.cfg                     cpp/issue_2623.cpp
 34323  issue_2623_2.cfg                     cpp/issue_2623.cpp
 34324  issue_2623_3.cfg                     cpp/issue_2623.cpp
+34325  Issue_3025.cfg                       cpp/Issue_3025.cpp
+34326  Issue_3040.cfg                       cpp/Issue_3040.cpp
+34327  Issue_3044.cfg                       cpp/Issue_3044.cpp
+34328  Issue_3048.cfg                       cpp/Issue_3048.cpp
+
+34330  Issue_3061_0nl.cfg                   cpp/Issue_3061_0nl.cpp
+34331  Issue_3061_0nl.cfg                   cpp/Issue_3061_1nl.cpp
+34332  Issue_3061_0nl.cfg                   cpp/Issue_3061_2nl.cpp
+34333  Issue_3061_1nl.cfg                   cpp/Issue_3061_0nl.cpp
+34334  Issue_3061_1nl.cfg                   cpp/Issue_3061_1nl.cpp
+34335  Issue_3061_1nl.cfg                   cpp/Issue_3061_2nl.cpp
+34336  Issue_3061_2nl.cfg                   cpp/Issue_3061_0nl.cpp
+34337  Issue_3061_2nl.cfg                   cpp/Issue_3061_1nl.cpp
+34338  Issue_3061_2nl.cfg                   cpp/Issue_3061_2nl.cpp
+34339  Issue_3061_3nl.cfg                   cpp/Issue_3061_0nl.cpp
+34340  Issue_3061_3nl.cfg                   cpp/Issue_3061_1nl.cpp
+34341  Issue_3061_3nl.cfg                   cpp/Issue_3061_2nl.cpp
+
+34350  indent_comma_brace.cfg               cpp/indent_comma_brace_glob.cpp
+34351  indent_comma_brace.cfg               cpp/indent_comma_brace_func.cpp
 
 # Adopt some UT tests
 10000  empty.cfg                            cpp/621_this-spacing.cpp
@@ -839,6 +880,7 @@
 10007  dont-process-defines.cfg             cpp/dont-process-defines.cpp
 10008  empty.cfg                            cpp/PR326_invalid-backslash-eol-csharp.cpp
 10009  STUCK_macro-difficulties.cfg         cpp/STUCK_macro-difficulties.cpp
+
 10020  U02-Cpp.cfg                          cpp/macro_spaces.cpp
 10021  U03-Cpp.cfg                          cpp/braces_align.cpp
 10022  U04-Cpp.cfg                          cpp/foreach.cpp
@@ -846,44 +888,61 @@
 10024  U06-Cpp.cfg                          cpp/ifcomment.cpp
 10025  U07-Cpp.cfg                          cpp/qtargs.cpp
 10026  sp_before_ellipsis-r.cfg             cpp/gcc_case_ellipsis.cpp
+10027  Issue_3058.cfg                       cpp/Issue_3058.cpp
+
 10047  U16-Cpp.cfg                          cpp/UNI-1334.cpp
 10048  empty.cfg                            cpp/UNI-1335.cpp
+
 10050  U18-Cpp.cfg                          cpp/UNI-1337.cpp
 10052  empty.cfg                            cpp/UNI-1339.cpp
 10053  UNI-1340.cfg                         cpp/UNI-1340.cpp
 10054  UNI-1344.cfg                         cpp/UNI-1344.cpp
 10056  UNI-1346.cfg                         cpp/UNI-1346.cpp
 10057  UNI-1347.cfg                         cpp/UNI-1347.cpp
+
 10060  UNI-1350.cfg                         cpp/UNI-1350.cpp
 10062  UNI-1356.cfg                         cpp/UNI-1356.cpp
 10063  UNI-1358.cfg                         cpp/UNI-1358.cpp
 10069  empty.cfg                            cpp/UNI-1980.cpp
+
 10070  U21-Cpp.cfg                          cpp/UNI-1981.cpp
 10071  empty.cfg                            cpp/UNI-1983.cpp
 10079  U23-Cpp.cfg                          cpp/UNI-9650.cpp
+
 10080  UNI-10496.cfg                        cpp/UNI-10496.cpp
+
 10100  issue_564.cfg                        cpp/issue_564.cpp
 10101  issue_574.cfg                        cpp/issue_574.cpp
+10102  issue_574-i-a.cfg                    cpp/issue_574.cpp
+10103  issue_574-i-b.cfg                    cpp/issue_574.cpp
+
 10566  empty.cfg                            cpp/issue_1752.cpp
+
 11000  UNI-12046.cfg                        cpp/UNI-12046.cpp
+
 20002  UNI-32657.cfg                        cpp/UNI-32657.cpp
+
 20011  empty.cfg                            cpp/UNI-38381.cpp
+
 60001  UNI-2650.cfg                         cpp/UNI-2650.cpp
 60002  U25-Cpp.cfg                          cpp/UNI-16283.cpp
 60003  U26-Cpp.cfg                          cpp/UNI-1288.cpp
 60006  UNI-2049.cfg                         cpp/UNI-2049.cpp
 60017  U27-Cpp.cfg                          cpp/UNI-2683.cpp
+
 60022  U28-Cpp.cfg                          cpp/UNI-18439.cpp
 60025  U29-Cpp.cfg                          cpp/UNI-19894.cpp
 60027  U30-Cpp.cfg                          cpp/UNI-21506.cpp
 60028  U31-Cpp.cfg                          cpp/UNI-21509.cpp
 60029  empty.cfg                            cpp/UNI-21510.cpp
+
 60030  U33-Cpp.cfg                          cpp/UNI-21727.cpp
 60031  empty.cfg                            cpp/UNI-21728.cpp
 60032  empty.cfg                            cpp/UNI-21729.cpp
 60036  UNI-2680.cfg                         cpp/UNI-2680.cpp
 60038  UNI-30088.cfg                        cpp/UNI-30088.cpp
 60039  U36-Cpp.cfg                          cpp/UNI-30628.cpp
+
 60042  UNI-18777.cfg                        cpp/UNI-18777.cpp
 60043  nl_remove_extra_newlines-1.cfg       cpp/i2033.cpp
 60044  nl_fdef_brace-r__nl_collapse_empty_body-t.cfg  cpp/i2116.cpp
@@ -892,8 +951,11 @@
 60047  align_default_after_override.cfg     cpp/align_default_after_override.cpp
 60048  bug_2322.cfg                         cpp/bug_2322.cpp
 60049  bug_2402.cfg                         cpp/bug_2402.cpp
+
 60050  mod_remove_extra_semicolon-t.cfg     cpp/semicolon-removal-after-ternary-operator.cpp
 60051  bug_2371.cfg                         cpp/bug_2371.cpp
 60052  bug_2433_1.cfg                       cpp/bug_2433_1.cpp
 60053  bug_2433_2.cfg                       cpp/bug_2433_2.cpp
 60054  interface-keyword-in-cpp.cfg         cpp/interface-keyword-in-cpp.cpp
+60055  issue_3116.cfg                       cpp/issue_3116.cpp
+60056  issue_3116.cfg                       cpp/issue_3116-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/d.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/d.test
index 59322029..59322029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/d.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/d.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/difftest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/difftest.sh
index 053cae17..053cae17 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/difftest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/difftest.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/ecma.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/ecma.test
index fdce3a7d..fdce3a7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/ecma.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/ecma.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00000-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00000-comment-indent.c
index b59ab389..b59ab389 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00000-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00000-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00001-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00001-comment-indent.c
index e4ba53de..e4ba53de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00001-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00001-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00002-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00002-comment-indent.c
index 09ca01ac..09ca01ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00002-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00002-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00003-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00003-comment-indent.c
index 0f906f2f..0f906f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00003-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00003-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00004-switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00004-switch.c
index ffb54327..ffb54327 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00004-switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00004-switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00005-cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00005-cmt-align.c
index 0a9684c5..0a9684c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00005-cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00005-cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00006-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00006-comment-convert.c
index c7a019f7..c7a019f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00006-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00006-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00007-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00007-comment-convert.c
index 886d7698..886d7698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00007-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00007-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00008-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00008-comment-convert.c
index c2af0f8b..c2af0f8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00008-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00008-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00009-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00009-comment-convert.c
index 0d3f218a..0d3f218a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00009-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00009-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00010-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00010-braces.c
index c4dc5faf..c4dc5faf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00010-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00010-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00011-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00011-braces.c
index 893a32f6..893a32f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00011-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00011-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00012-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00012-braces.c
index 851f4df9..851f4df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00012-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00012-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00013-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00013-braces.c
index 2adcab76..2adcab76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00013-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00013-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00014-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00014-braces.c
index 1966a0c7..1966a0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00014-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00014-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00015-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00015-braces.c
index c29cdecd..c29cdecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00015-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00015-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00016-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00016-braces.c
index ce7df756..ce7df756 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00016-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00016-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00020-define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00020-define-if-indent.c
index f7efd78c..f7efd78c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00020-define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00020-define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00050-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00050-brace-remove.c
index 857e4031..857e4031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00050-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00050-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00051-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00051-brace-remove.c
index bef3e64d..bef3e64d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00051-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00051-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00052-brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00052-brace-remove2.c
index 30f352c6..30f352c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00052-brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00052-brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00053-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00053-brace.c
index 55c45a57..55c45a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00053-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00053-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00054-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00054-if_chain.c
index a6e0c561..a6e0c561 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00054-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00054-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00055-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00055-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00055-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00055-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00056-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00056-brace-remove3.c
index 258ca555..258ca555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00056-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00056-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00057-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00057-brace-remove3.c
index 26b22e2c..26b22e2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00057-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00057-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00058-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00058-if_chain.c
index ba15dc8e..ba15dc8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00058-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00058-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00060-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00060-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00060-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00060-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00061-braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00061-braces-3.c
index 18784b82..18784b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00061-braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00061-braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00062-braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00062-braces-4.c
index 05c0d9b5..05c0d9b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00062-braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00062-braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00065-braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00065-braces-5.c
index 6e1e6cab..6e1e6cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00065-braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00065-braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00066-vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00066-vb-while.c
index c189b7b7..c189b7b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00066-vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00066-vb-while.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00067-vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00067-vb-do.c
index 79c6dedf..79c6dedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00067-vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00067-vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00068-bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00068-bsnl.c
index 310e0eb2..310e0eb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00068-bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00068-bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00069-vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00069-vb-pp.c
index 9fb79a06..9fb79a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00069-vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00069-vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00070-return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00070-return-multi.c
index d351cdb0..d351cdb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00070-return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00070-return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00071-include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00071-include_define.h
index 89f11e5a..89f11e5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00071-include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00071-include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00072-align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00072-align-proto.c
index 15746cd9..15746cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00072-align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00072-align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00073-nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00073-nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00073-nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00073-nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00074-clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00074-clang-has_include.h
index 976de29d..976de29d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00074-clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00074-clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00076-1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00076-1225.c
index 5b51cf3c..5b51cf3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00076-1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00076-1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00081-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00081-else-if.c
index ff5f5b21..ff5f5b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00081-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00081-else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00082-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00082-else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00082-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00082-else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00091-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00091-cond.c
index 840d4a6c..840d4a6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00091-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00091-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00092-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00092-cond.c
index a718a48b..a718a48b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00092-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00092-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00093-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00093-cond.c
index 8d55652a..8d55652a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00093-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00093-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00101-bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00101-bugs-1.c
index abc2e08e..abc2e08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00101-bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00101-bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00102-bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00102-bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00102-bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00102-bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00103-bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00103-bugs-3.c
index 07d410b1..07d410b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00103-bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00103-bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00104-bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00104-bugs-4.c
index 61885443..61885443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00104-bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00104-bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00105-bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00105-bugs-5.c
index 72bfbe4d..72bfbe4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00105-bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00105-bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00106-bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00106-bugs-6.c
index 302c2328..302c2328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00106-bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00106-bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00107-bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00107-bugs-7.c
index 34fc146e..34fc146e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00107-bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00107-bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00108-bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00108-bugs-8.c
index 0eae4dff..0eae4dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00108-bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00108-bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00110-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00110-misc.c
index fdca271b..fdca271b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00110-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00110-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00111-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00111-misc.c
index ad40a4ea..ad40a4ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00111-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00111-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00120-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00120-sp_cmt_cpp_start.c
index 74a333c5..74a333c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00120-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00120-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00121-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00121-sp_cmt_cpp_start.c
index 3160a288..3160a288 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00121-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00121-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00122-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00122-sp_cmt_cpp_start.c
index fe237c5a..fe237c5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00122-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00122-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00123-cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00123-cmt_reflow.c
new file mode 100644
index 00000000..44e0cf34
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00123-cmt_reflow.c
@@ -0,0 +1,50 @@
+/**
+ * Search the tree for a match that satisfies specific comparison
+ * criteria, branch contains the desired data for which to search the
+ * tree
+ * @param  compareFunc is a binary function object that defines how to
+ *                     compare nodes
+ * @param  bRetrieve   indicates whether or not the input search
+ *                     branch should be modified to reflect a branch
+ *                     in the tree, assuming a match satisfying the
+ *                     given search criteria exists
+ * @return             true if a branch matching the input is found or
+ *                     returns nullptr otherwise
+ *
+ *    It was the best of times, it was the worst of times, it was the
+ *    age of wisdom, it was the age of foolishness, it was the epoch
+ *    of belief, it was the epoch of incredulity, it was the season of
+ *    Light, it was the season of Darkness, it was the spring of hope,
+ *    it was the winter of despair, we had everything before us, we
+ *    had nothing before us, we were all going direct to Heaven, we
+ *    were all going direct the other way--in short, the period was so
+ *    far like the present period, that some of its noisiest
+ *    authorities insisted on its being received, for good or for
+ *    evil, in the superlative degree of comparison only.
+ *
+ *        There were a king with a large jaw and a queen with a plain
+ *        face on the throne of England; there were a king with a
+ *        large jaw and a queen with a fair face, on the throne of
+ *        France. In both countries it was clearer than crystal to the
+ *        lords of the State preserves of loaves and fishes, that
+ *        things in general were settled for ever.
+ *
+ *            It was the year of Our Lord one thousand seven hundred
+ *            and seventy-five. Spiritual revelations were conceded to
+ *            England at that favoured period, as at this. Mrs.
+ *            Southcott had recently attained her five-and-twentieth
+ *            blessed birthday, of whom a prophetic private in the
+ *            Life Guards had heralded the sublime appearance by
+ *            announcing that arrangements were made for the
+ *            swallowing up of London and Westminster. Even the
+ *            Cock-lane ghost had been laid only a round dozen of
+ *            years, after rapping out its messages, as the spirits of
+ *            this very year last past (supernaturally deficient in
+ *            originality) rapped out theirs. Mere messages in the
+ *            earthly order of events had lately come to the English
+ *            Crown and People, from a congress of British subjects in
+ *            America: which, strange to relate, have proved more
+ *            important to the human race than any communications yet
+ *            received through any of the chickens of the Cock-lane
+ *            brood.
+ */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00130-minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00130-minus-minus.c
index debe70a8..debe70a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00130-minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00130-minus-minus.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00135-br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00135-br_cmt.c
index 9e6c6de9..9e6c6de9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00135-br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00135-br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00140-global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00140-global-vars.c
index 0df79336..0df79336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00140-global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00140-global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00141-deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00141-deref.c
index a7ad3f5e..a7ad3f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00141-deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00141-deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00142-type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00142-type-cast.c
index 93076825..93076825 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00142-type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00142-type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00143-t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00143-t3.in.c
index b40fbd17..b40fbd17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00143-t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00143-t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00144-align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00144-align-proto-vars.c
index c7bf6081..c7bf6081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00144-align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00144-align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00145-vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00145-vardefcol.c
index 1238be0d..1238be0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00145-vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00145-vardefcol.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00150-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00150-casts.c
index d89ad598..d89ad598 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00150-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00150-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00151-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00151-casts.c
index 9f2a13de..9f2a13de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00151-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00151-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00152-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00152-casts.c
index acc2ebe4..acc2ebe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00152-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00152-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00153-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00153-casts.c
index 8bf710b6..8bf710b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00153-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00153-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00154-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00154-casts.c
index fca4010b..fca4010b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00154-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00154-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00155-cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00155-cast_brace.c
index 6e8f12b2..6e8f12b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00155-cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00155-cast_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00160-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00160-fcn_indent.c
index 23c173c2..23c173c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00160-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00160-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00161-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00161-fcn_indent.c
index 90342554..90342554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00161-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00161-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00162-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00162-fcn_indent.c
index c8f152d3..c8f152d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00162-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00162-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00163-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00163-fcn_indent.c
index bbf36763..bbf36763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00163-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00163-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00164-fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
index c029669a..c029669a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
index af30d708..af30d708 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00170-beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00170-beautifier-off.c
index 351d76ff..351d76ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00170-beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00170-beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00180-lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00180-lvalue.c
index a8121da4..a8121da4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00180-lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00180-lvalue.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00201-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00201-case.c
index 0d004c19..0d004c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00201-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00201-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00202-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00202-case.c
index d5175084..d5175084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00202-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00202-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00203-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00203-case.c
index 548a2a64..548a2a64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00203-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00203-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00204-bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00204-bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00204-bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00204-bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00205-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00205-case-nl_before_return.c
index b650d7ab..b650d7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00205-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00205-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00206-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00206-case-nl_before_return.c
index d0b6bbbb..d0b6bbbb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00206-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00206-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00301-align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00301-align-struct-init.c
index cfa44035..cfa44035 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00301-align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00301-align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00302-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00302-one-liner-init.c
index 63c86afe..63c86afe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00302-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00302-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00303-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00303-one-liner-init.c
index 503eedfb..503eedfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00303-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00303-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00304-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00304-one-liner-init.c
index 471aaa2d..471aaa2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00304-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00304-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00305-one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00305-one-liner-define.c
index 99f24f5a..99f24f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00305-one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00305-one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00310-sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00310-sp_embed_comment.c
index 3dc105aa..3dc105aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00310-sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00310-sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00320-indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00320-indent_first_bool_expr.c
index 0dcaa413..0dcaa413 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00320-indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00320-indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00401-align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00401-align-equ.c
index 9b213f96..9b213f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00401-align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00401-align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00402-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00402-align-var.c
index d7396d46..d7396d46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00402-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00402-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00403-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00403-align-var.c
index cb62295e..cb62295e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00403-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00403-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00404-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00404-align-var.c
index 48af3d3c..48af3d3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00404-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00404-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00405-bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00405-bits.c
index 9a5a6ceb..9a5a6ceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00405-bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00405-bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00406-bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00406-bug_i_771.c
index 9c2b1cc2..9c2b1cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00406-bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00406-bug_i_771.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00411-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00411-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00411-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00411-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00412-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00412-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00412-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00412-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00413-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00413-align-typedef.c
index d5f826e5..d5f826e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00413-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00413-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00414-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00414-align-typedef.c
index 8e63e499..8e63e499 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00414-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00414-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00415-align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00415-align_stack.c
index 507d6da2..507d6da2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00415-align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00415-align_stack.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00416-align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00416-align_sf_call_thresh_416.c
index 36fbca84..36fbca84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00416-align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00416-align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00417-align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00417-align_sf_call_thresh_417.c
index 3047b932..3047b932 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00417-align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00417-align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00418-align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00418-align_sf_call_span_418.c
index 82444a2b..82444a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00418-align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00418-align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00419-align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00419-align_sf_call_span_419.c
index 20b9705a..20b9705a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00419-align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00419-align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00420-Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00420-Issue-2278.c
index 2bab88ab..2bab88ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00420-Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00420-Issue-2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00421-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00421-nl_ds_struct_enum.c
index ec5bcc31..ec5bcc31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00421-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00421-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00422-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00422-nl_ds_struct_enum.c
index d45b2add..d45b2add 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00422-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00422-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00423-bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00423-bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00423-bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00423-bug_1702.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00430-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00430-paren-indent.c
index f6b148ce..f6b148ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00430-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00430-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00431-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00431-paren-indent.c
index 51a80854..51a80854 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00431-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00431-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00432-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00432-paren-indent.c
index 9ab77831..9ab77831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00432-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00432-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00440-bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00440-bug_489.c
index 47a5da06..47a5da06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00440-bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00440-bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00451-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00451-enum_gallery.c
index 3cb8db3c..3cb8db3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00451-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00451-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00452-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00452-enum_gallery.c
index cb235c3d..cb235c3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00452-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00452-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00453-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.c
index af537d1d..af537d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00453-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00453-enum_gallery.rerun.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.rerun.c
index 148f1970..148f1970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00453-enum_gallery.rerun.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00453-enum_gallery.rerun.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00454-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00454-enum_gallery.c
index 8d00cbce..8d00cbce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00454-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00454-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00501-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00501-bool-pos.c
index b9d537a1..b9d537a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00501-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00501-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00502-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00502-bool-pos.c
index 7890fcd7..7890fcd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00502-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00502-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00503-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00503-pos_compare.c
index cc809a09..cc809a09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00503-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00503-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00504-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00504-pos_compare.c
index fe16e10e..fe16e10e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00504-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00504-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00505-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00505-pos_conditional.c
index 91f17d57..91f17d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00505-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00505-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00506-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00506-pos_conditional.c
index 23945656..23945656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00506-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00506-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00510-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00510-bool-pos.c
index 5958e3c5..5958e3c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00510-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00510-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00511-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00511-bool-pos.c
index 8f6effd8..8f6effd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00511-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00511-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00512-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00512-bool-pos.c
index 2e82b7ef..2e82b7ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00512-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00512-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00513-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00513-bool-pos.c
index cad844c5..cad844c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00513-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00513-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00514-my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00514-my_infile.c
index 3f4c76fb..3f4c76fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00514-my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00514-my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00600-dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00600-dos.c
index a0482ba3..a0482ba3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00600-dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00600-dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00601-mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00601-mac.c
index 2be04c61..2be04c61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00601-mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00601-mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00611-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00611-pp-space.c
index 217fc89a..217fc89a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00611-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00611-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00612-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00612-pp-space.c
index 7c19bf1e..7c19bf1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00612-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00612-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00613-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00613-pp-space.c
index 7092a193..7092a193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00613-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00613-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00614-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00614-pp-space.c
index 103c2ca4..103c2ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00614-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00614-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00615-pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00615-pp-nest.c
index 5e99a1d0..5e99a1d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00615-pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00615-pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00616-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00616-pp-if-indent.c
index dc2dea10..dc2dea10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00616-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00616-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00617-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00617-pp-if-indent.c
index 2caf73d2..2caf73d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00617-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00617-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00618-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00618-pp-if-indent.c
index f7b3d270..f7b3d270 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00618-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00618-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00620-indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00620-indent-assign.c
index c01e146a..c01e146a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00620-indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00620-indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00621-nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00621-nl_endif.c
index bae6272c..bae6272c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00621-nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00621-nl_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00622-indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00622-indent-off-after-assign.c
index eb083f7b..eb083f7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00622-indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00622-indent-off-after-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00631-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00631-nl_assign.c
index 7319d498..7319d498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00631-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00631-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00632-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00632-nl_assign.c
index 2452e773..2452e773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00632-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00632-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00633-bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00633-bug_3156.c
new file mode 100644
index 00000000..508a0098
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00633-bug_3156.c
@@ -0,0 +1,2 @@
+#define X 1 +
+int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00701-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00701-function-def.c
index 6f0133e8..6f0133e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00701-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00701-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00702-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00702-function-def.c
index eaa568da..eaa568da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00702-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00702-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00703-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00703-function-def.c
index 76cf664f..76cf664f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00703-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00703-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00710-add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00710-add_long_comment.c
index 82bf680e..82bf680e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00710-add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00710-add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00721-nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00721-nl-semicolon.c
index 441091b5..441091b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00721-nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00721-nl-semicolon.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00801-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00801-fcn_type.c
index 72af3fa3..72af3fa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00801-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00801-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00802-funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00802-funcfunc.c
index 4d0f0432..4d0f0432 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00802-funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00802-funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00803-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00803-fcn_type.c
index 9e1e5c55..9e1e5c55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00803-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00803-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00901-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00901-code_width.c
index 672f9153..672f9153 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00901-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00901-code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00902-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00902-code_width.c
index 9c5a4cec..9c5a4cec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00902-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00902-code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00903-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00903-code_width.c
index 049e952d..049e952d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00903-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00903-code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00910-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00910-pascal_ptr.c
index 27a9cdef..27a9cdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00910-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00910-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00911-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00911-pascal_ptr.c
index 4c0d0dde..4c0d0dde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/00911-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/00911-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01000-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01000-mod-paren.c
index ca919f77..ca919f77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01000-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01000-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01001-nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01001-nl-comment.c
index ecac3e2a..ecac3e2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01001-nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01001-nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01002-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01002-mod-paren.c
index 2537330f..2537330f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01002-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01002-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01005-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01005-mod_case_brace.c
index 8bb32e20..caeae178 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01005-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01005-mod_case_brace.c
@@ -17,8 +17,8 @@ int foo(int bar)
 
    case 2:
       {
+         break;
       }
-      break;
 
    case 3:
       {
@@ -59,8 +59,8 @@ int foo(int bar)
             }
             break;
          }
+         break;
       }
-      break;
 
    default:
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01006-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01006-mod_case_brace.c
index 371bd5cb..371bd5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01006-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01006-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01007-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01007-mod_case_brace.c
index 2ea3dea5..2ea3dea5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01007-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01007-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01011-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01011-semicolons.c
index 962ec588..962ec588 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01011-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01011-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01012-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01012-semicolons.c
index 54d895e7..54d895e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01012-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01012-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01015-paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01015-paren_indent.c
index d993315c..d993315c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01015-paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01015-paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01016-align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01016-align_attr.c
index 012217e4..012217e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01016-align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01016-align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01020-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01020-kw_subst.c
index 61b43c3f..61b43c3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01020-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01020-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01021-hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01021-hello.c
index 6ba46ef7..6ba46ef7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01021-hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01021-hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01022-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01022-kw_subst.c
index 6cba8370..6cba8370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01022-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01022-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01030-multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01030-multi.h
index 14a599c7..14a599c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01030-multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01030-multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01035-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01035-func_wrap.c
index b2f86805..b2f86805 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01035-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01035-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01036-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01036-func_wrap.c
index 24e932ed..24e932ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01036-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01036-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01037-type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01037-type_wrap.c
index c3c23569..c3c23569 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01037-type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01037-type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01040-newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01040-newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01040-newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01040-newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01050-func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01050-func_call_user.c
index 82eba7cb..82eba7cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01050-func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01050-func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01060-backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01060-backslash-newline-lex.c
index f5000b82..f5000b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01060-backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01060-backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01070-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01070-various_colons.c
index 0850b17e..0850b17e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01070-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01070-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01071-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01071-various_colons.c
index e25134ab..e25134ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01071-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01071-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01080-bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01080-bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/01080-bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/01080-bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02000-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02000-i2c-core.c
index cfe6b053..cfe6b053 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02000-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02000-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02001-directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02001-directfb.h
index 3c7ffc18..3c7ffc18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02001-directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02001-directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02002-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02002-i2c-core.c
index 1acca5ab..1acca5ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02002-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02002-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02100-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02100-i2c-core.c
index 899b0dd9..899b0dd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02100-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02100-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02101-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02101-comment-indent.c
index 7c5f0f0c..7c5f0f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02101-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02101-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02200-xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02200-xml.c
index 62bd81d0..62bd81d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02200-xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02200-xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02201-align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02201-align-string.c
index 0b2cf25a..0b2cf25a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02201-align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02201-align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02300-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02300-preproc-if.c
index 8e20a744..8e20a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02300-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02300-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02301-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02301-preproc-if.c
index 0130e1f5..0130e1f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02301-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02301-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02302-nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02302-nl-cont.c
index dfbb0c2d..dfbb0c2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02302-nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02302-nl-cont.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02303-nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02303-nl-cont2.c
index a0129423..a0129423 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02303-nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02303-nl-cont2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02310-empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02310-empty-for.c
index 4bd43b09..4bd43b09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02310-empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02310-empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02311-pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02311-pragma.c
index ec944697..ec944697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02311-pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02311-pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02315-pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02315-pp_ret.c
index 18a3d5cb..18a3d5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02315-pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02315-pp_ret.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02320-nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02320-nl_create_one_liner.c
index 55974c3c..55974c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02320-nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02320-nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02325-sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02325-sort_include.c
index 4f2b20bf..4f2b20bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02325-sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02325-sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02330-one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02330-one_liners.c
new file mode 100644
index 00000000..57d8ba44
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02330-one_liners.c
@@ -0,0 +1,12 @@
+int baz() { return 0; }
+
+int main()
+{
+	int a, b;
+	int f[2] = { 1, 2 };
+	enum foo { BAR = 15 };
+	if (1) { a++; b++; }
+	while (0) { a++; b++; }
+	do { a++; b++; } while (0);
+	for (;;) { a++; b++; };
+}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02410-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02410-ifdef-indent.c
index e71d8cf3..e71d8cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02410-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02410-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02411-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02411-ifdef-indent.c
index bf39a98c..bf39a98c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02411-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02411-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02412-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02412-ifdef-indent.c
index 23b4dd37..23b4dd37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02412-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02412-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02413-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02413-ifdef-indent.c
index 8738bbf7..8738bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02413-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02413-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02414-whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02414-whole_file_ifdef.c
index c767bbf7..c767bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02414-whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02414-whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02415-endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02415-endif.c
index c8b99a6a..c8b99a6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02415-endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02415-endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02416-cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02416-cmt_nl_end.c
index 56de21ec..56de21ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02416-cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02416-cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02421-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02421-cmt_multi.c
index 61faac36..61faac36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02421-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02421-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02422-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02422-cmt_multi.c
index bbdd79cd..bbdd79cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02422-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02422-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02423-cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02423-cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02423-cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02423-cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02431-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02431-cmt_right_align.c
index 315e5010..315e5010 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02431-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02431-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02432-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02432-cmt_right_align.c
index eef43777..eef43777 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02432-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02432-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02440-string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02440-string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02440-string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02440-string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02441-utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02441-utf8-identifiers.c
index 1dc39e9c..1dc39e9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02441-utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02441-utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02451-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02451-nl_return_expr.c
index bf8621d5..bf8621d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02451-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02451-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02452-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02452-nl_return_expr.c
index 4dc23adf..4dc23adf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02452-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02452-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02453-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02453-nl_return_expr.c
index c917fb17..c917fb17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02453-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02453-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02454-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02454-nl_return_expr.c
index 2e33d2b0..2e33d2b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02454-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02454-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02455-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02455-macro-returns.c
index dba84c56..dba84c56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02455-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02455-macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02456-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02456-macro-returns.c
index 7cd29044..7cd29044 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02456-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02456-macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02457-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02457-nl_before_return.c
index a396202f..a396202f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02457-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02457-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02460-freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02460-freebsd.c
index 804c5ec7..804c5ec7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02460-freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02460-freebsd.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02486-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02486-doxy-comment.c
index e2a6c2c4..e2a6c2c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02486-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02486-doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02487-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02487-doxy-comment.c
index 4abad3c8..4abad3c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02487-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02487-doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02501-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02501-custom_types_ssl.c
index 3e28d2e3..3e28d2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02501-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02501-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02502-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02502-custom_types_ssl.c
index 0df5ddad..0df5ddad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02502-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02502-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02503-pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02503-pp_concat_asn1.h
index babfa69d..babfa69d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02503-pp_concat_asn1.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02503-pp_concat_asn1.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02504-align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02504-align_keep_extra.c
index 985f428c..985f428c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02504-align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02504-align_keep_extra.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02510-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02510-asm.c
index 6609bf9b..6609bf9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/02510-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/02510-asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/07630-indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/07630-indent-vbrace.c
index a1344348..a1344348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/07630-indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/07630-indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/08399-gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/08399-gh399.c
index 780234ab..780234ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/08399-gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/08399-gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09588-sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09588-sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09588-sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09588-sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09594-sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09594-sf594.c
index 94a1973c..94a1973c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09594-sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09594-sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09601-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09601-sp_after_sparen.c
index 93cbfea2..93cbfea2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09601-sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09601-sp_after_sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09602-bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09602-bug_671.c
index a9d54ee8..a9d54ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09602-bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09602-bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09603-indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09603-indent_ternary-1.c
index f9200886..f9200886 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09603-indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09603-indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09604-indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09604-indent_ternary-2.c
index e6d3576c..e6d3576c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09604-indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09604-indent_ternary-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09605-negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09605-negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09605-negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09605-negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09606-extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09606-extern.c
index d43131fe..d43131fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09606-extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09606-extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09607-attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09607-attribute.c
index 19e3a057..19e3a057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09607-attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09607-attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09608-func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09608-func_call_user2.c
index ee4e24d4..ee4e24d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09608-func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09608-func_call_user2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09609-Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09609-Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09609-Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09609-Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09610-bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09610-bug_i_876.c
index e1afece6..e1afece6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09610-bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09610-bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09611-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09611-bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09611-bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09611-bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09612-bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09612-bug_1041.c
index 7c07615b..7c07615b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09612-bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09612-bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09613-i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09613-i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09613-i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09613-i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09614-string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09614-string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09614-string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09614-string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09615-i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09615-i1564.c
index 2b37b25c..2b37b25c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09615-i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09615-i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09616-enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09616-enum_comma_ifdef.c
index 95637aae..95637aae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09616-enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09616-enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09617-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09617-Issue_2360.c
index 0489b0f9..0489b0f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09617-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09617-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09618-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09618-Issue_2360.c
index 898c64e6..898c64e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09618-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09618-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09619-Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09619-Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09619-Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09619-Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09620-Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09620-Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09620-Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09620-Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09621-pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09621-pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/09621-pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/09621-pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10003-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10003-bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10003-bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10003-bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10004-pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10004-pragma_asm.c
index 0e6b48d6..0e6b48d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10004-pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10004-pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10005-i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10005-i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10005-i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10005-i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10006-bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10006-bug_2331.c
index 67088d94..67088d94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10006-bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10006-bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10007-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10007-indent-macro-brace.c
index 192a399f..192a399f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10007-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10007-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10008-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10008-indent-macro-brace.c
index a54cd504..a54cd504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10008-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10008-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10009-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10009-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10009-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10009-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10010-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10010-return-compound-literal.c
index da33e2fd..da33e2fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10010-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10010-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10011-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10011-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10011-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10011-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10012-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10012-sparen-indent.c
index d9ddbe06..d9ddbe06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10012-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10012-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10013-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10013-sparen-indent.c
index b09a3102..b09a3102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10013-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10013-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10014-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10014-sparen-indent.c
index bf0ba8cf..bf0ba8cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10014-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10014-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10015-Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10015-Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/c/10015-Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/c/10015-Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/0044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/0044-i2116.cpp
index af664cd9..af664cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/0044-i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/0044-i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/02102-indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02102-indent-c.cpp
index 0170d8f4..70648397 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/02102-indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02102-indent-c.cpp
@@ -518,7 +518,7 @@ void indent_text(void)
          * { a++;
          *   b--; };
          */
-        next = chunk_get_next_ncnl(pc);
+        next = chunk_get_next_ncnnl(pc);
 
         if (!chunk_is_newline_between(pc, next))
           frm.pse[frm.pse_tos].indent = next->column;
@@ -663,7 +663,7 @@ void indent_text(void)
        * everything else
        */
 
-      prev = chunk_get_prev_ncnl(pc);
+      prev = chunk_get_prev_ncnnl(pc);
 
       if ((pc->type == CT_MEMBER) ||
           (pc->type == CT_DC_MEMBER) ||
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/02103-output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02103-output.cpp
index ca003784..ca003784 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/02103-output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/02103-output.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10000-621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10000-621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10000-621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10000-621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
index c466b45c..c466b45c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10002-623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10002-623_caret-spacing.cpp
index 5058ea4b..5058ea4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10002-623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10002-623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
index 4160ecca..4160ecca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10005-define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10005-define-indentation.cpp
index 24370df9..24370df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10005-define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10005-define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10006-dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10006-dont-detab-strings.cpp
index 11352d82..11352d82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10006-dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10006-dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10007-dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10007-dont-process-defines.cpp
index 56f6852e..56f6852e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10007-dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10007-dont-process-defines.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
index dfd33ac7..dfd33ac7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10020-macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10020-macro_spaces.cpp
index 55a50766..55a50766 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10020-macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10020-macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10021-braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10021-braces_align.cpp
index 40d966f5..40d966f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10021-braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10021-braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10022-foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10022-foreach.cpp
index 2862e6ef..2862e6ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10022-foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10022-foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10023-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10023-for_auto.cpp
index 775031a5..775031a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10023-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10023-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10024-ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10024-ifcomment.cpp
index b41c5c6f..b41c5c6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10024-ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10024-ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10025-qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10025-qtargs.cpp
index 01d94543..01d94543 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10025-qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10025-qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
index b188c210..b188c210 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10027-Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10027-Issue_3058.cpp
new file mode 100644
index 00000000..09e1dc92
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10027-Issue_3058.cpp
@@ -0,0 +1,86 @@
+KJS::Value KJS::KateJSViewProtoFunc::call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args)
+{
+  switch (id)
+  {
+    case KateJSView::SetCursorPositionReal:
+    {
+      return KJS::Boolean( view->setCursorPositionReal( args[0].toUInt32(exec), args[1].toUInt32(exec) ) );
+    }
+
+    // SelectionInterface goes in the view, in anticipation of the future
+    case KateJSView::Selection:
+    {
+      return KJS::String( view->selection() );
+    }
+  }
+
+  return KJS::Undefined();
+}
+
+void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
+                                 uint &attrCol, bool &unclosedTag)
+{
+  for(pos = 0; pos < len; ++pos) {
+    int ch = text.at(pos).unicode();
+    switch(ch) {
+      case '<':
+      {
+        ++numTags;
+        break;
+      }
+
+      // don't indent because of DOCTYPE, comment, CDATA, etc.
+      case '!':
+      {
+        if(lastCh == '<') --numTags;
+        break;
+      }
+
+      // don't indent because of xml decl or PI
+      case '?':
+      {
+        if(lastCh == '<') --numTags;
+        break;
+      }
+    }
+  }
+}
+
+static YYSIZE_T yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+  {
+    for (;;)
+      switch (*++yyp)
+      {
+        case '\\':
+        {
+          if (*++yyp != '\\')
+            yyres[yyn] = *yyp;
+        }
+        /* Fall through.  */
+        default:
+        {
+          if (yyres)
+            yyres[yyn] = *yyp;
+          yyn++;
+          break;
+        }
+      }
+  }
+  return yystpcpy (yyres, yystr) - yyres;
+}
+
+Value RegExpProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args)
+{
+  if (!thisObj.inherits(&RegExpImp::info)) {
+    if (thisObj.inherits(&RegExpPrototypeImp::info)) {
+      switch (id) {
+        case ToString:
+        { return String("//");              // FireFox returns /(?:)/
+        }
+      }
+    }
+    return err;
+  }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10047-UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10047-UNI-1334.cpp
index 9a856f91..9a856f91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10047-UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10047-UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10048-UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10048-UNI-1335.cpp
index 891b945a..891b945a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10048-UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10048-UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10050-UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10050-UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10050-UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10050-UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10052-UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10052-UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10052-UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10052-UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10053-UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10053-UNI-1340.cpp
index 2a96aa31..2a96aa31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10053-UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10053-UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10054-UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10054-UNI-1344.cpp
index 43c4429e..43c4429e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10054-UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10054-UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10056-UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10056-UNI-1346.cpp
index af875c3e..af875c3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10056-UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10056-UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10057-UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10057-UNI-1347.cpp
index ec8f350b..ec8f350b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10057-UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10057-UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10060-UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10060-UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10060-UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10060-UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10062-UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10062-UNI-1356.cpp
index c70ca61d..c70ca61d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10062-UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10062-UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10063-UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10063-UNI-1358.cpp
index 120aa9c4..120aa9c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10063-UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10063-UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10069-UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10069-UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10069-UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10069-UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10070-UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10070-UNI-1981.cpp
index d4f74dc3..d4f74dc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10070-UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10070-UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10071-UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10071-UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10071-UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10071-UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10079-UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10079-UNI-9650.cpp
index 0d6cdb46..0d6cdb46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10079-UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10079-UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10080-UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10080-UNI-10496.cpp
index 81122be8..81122be8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10080-UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10080-UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10100-issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10100-issue_564.cpp
index ac5fbef3..ac5fbef3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10100-issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10100-issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10101-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp
index e34762ec..6621d455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10101-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp
@@ -1,13 +1,14 @@
 class A

 {

 // crash (two parameter, 2nd string parameter has space)

-    void check(const QObject *object, const QStringList &strList = QStringList(QString(QLatin1String("one two"))));

+    void check(const QObject *object, const QStringList &strList=QStringList(QString(QLatin1String("one two"))));

 // no crash (two parameter, 2nd string parameter has no space)

-    void check(const QObject *object, const QStringList &strList = QStringList(QString(QLatin1String("one"))));

+    void check(const QObject *object, const QStringList &strList= QStringList(QString(QLatin1String("one"))));

 // no crash (removed QLatin1String)

-    void check(const QObject *object, const QStringList &strList = QStringList(QString(("one two"))));

+    void check(const QObject *object, const QStringList &strList =QStringList(QString(("one two"))));

 // no crash (removed QString(QLatin1String))

     void check(const QObject *object, const QStringList &strList = QStringList());

 // no crash (removed 1st parameter only)

     void check(const QStringList &strList = QStringList(QString(QLatin1String("one two"))));

 };

+int A=5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10101-issue_574.cpp-a b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp-a
index a1065b4e..a1065b4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10101-issue_574.cpp-a
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10101-issue_574.cpp-a
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10102-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10102-issue_574.cpp
new file mode 100644
index 00000000..0f3b7da3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10102-issue_574.cpp
@@ -0,0 +1,14 @@
+class A

+{

+// crash (two parameter, 2nd string parameter has space)

+    void check(const QObject *object, const QStringList &strList =QStringList(QString(QLatin1String("one two"))));

+// no crash (two parameter, 2nd string parameter has no space)

+    void check(const QObject *object, const QStringList &strList =QStringList(QString(QLatin1String("one"))));

+// no crash (removed QLatin1String)

+    void check(const QObject *object, const QStringList &strList =QStringList(QString(("one two"))));

+// no crash (removed QString(QLatin1String))

+    void check(const QObject *object, const QStringList &strList =QStringList());

+// no crash (removed 1st parameter only)

+    void check(const QStringList &strList =QStringList(QString(QLatin1String("one two"))));

+};

+int A =5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10103-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10103-issue_574.cpp
new file mode 100644
index 00000000..b87e76fe
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10103-issue_574.cpp
@@ -0,0 +1,14 @@
+class A

+{

+// crash (two parameter, 2nd string parameter has space)

+    void check(const QObject *object, const QStringList &strList= QStringList(QString(QLatin1String("one two"))));

+// no crash (two parameter, 2nd string parameter has no space)

+    void check(const QObject *object, const QStringList &strList= QStringList(QString(QLatin1String("one"))));

+// no crash (removed QLatin1String)

+    void check(const QObject *object, const QStringList &strList= QStringList(QString(("one two"))));

+// no crash (removed QString(QLatin1String))

+    void check(const QObject *object, const QStringList &strList= QStringList());

+// no crash (removed 1st parameter only)

+    void check(const QStringList &strList= QStringList(QString(QLatin1String("one two"))));

+};

+int A= 5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10566-issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10566-issue_1752.cpp
index 8e16cfa3..8e16cfa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/10566-issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/10566-issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/11000-UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/11000-UNI-12046.cpp
index 5ffc0da9..5ffc0da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/11000-UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/11000-UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/20002-UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20002-UNI-32657.cpp
index eb7655da..eb7655da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/20002-UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20002-UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/20011-UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20011-UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/20011-UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/20011-UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30000-cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30000-cout.cpp
index f099751f..f099751f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30000-cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30000-cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30001-alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30001-alt_tokens.cpp
index 02083b88..02083b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30001-alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30001-alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30002-constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30002-constructor.cpp
index f7cbb30d..f7cbb30d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30002-constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30002-constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30003-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30003-strings.cpp
index acef8744..acef8744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30003-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30003-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30010-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30010-class.h
index 2293d9c8..2293d9c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30010-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30010-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30011-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30011-misc.cpp
index 9e3b8c5b..9e3b8c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30011-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30011-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30012-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30012-misc2.cpp
index c5febbac..c5febbac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30012-misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30012-misc2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30013-sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30013-sim.h
index 835ae666..835ae666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30013-sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30013-sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30014-ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30014-ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30014-ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30014-ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30015-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30015-exception.cpp
index 75a4f97e..75a4f97e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30015-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30015-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30016-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30016-custom-open.cpp
index 234f5591..234f5591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30016-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30016-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30017-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30017-custom-open.cpp
index 6acd92e5..6acd92e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30017-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30017-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30018-class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30018-class-addr.h
index 042579dc..042579dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30018-class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30018-class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30019-wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30019-wacky-template.cpp
index cf6e5c87..cf6e5c87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30019-wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30019-wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30020-bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30020-bool.cpp
index 9f9e55b2..9f9e55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30020-bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30020-bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30021-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30021-byref.cpp
index 87f6c44a..87f6c44a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30021-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30021-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30022-extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30022-extern_c.h
index a97d93b8..a97d93b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30022-extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30022-extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30023-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30023-templates.cpp
index 239d6865..239d6865 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30023-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30023-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30024-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30024-class-init.cpp
index 884d5c71..884d5c71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30024-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30024-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30025-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30025-class-init.cpp
index 703686ac..703686ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30025-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30025-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30026-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30026-byref.cpp
index 2534aa05..2534aa05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30026-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30026-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30027-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30027-byref.cpp
index d0598697..d0598697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30027-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30027-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30028-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30028-byref.cpp
index 7a97856d..7a97856d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30028-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30028-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30029-init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30029-init_align.h
index 085f838b..085f838b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30029-init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30029-init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30030-Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30030-Timestamp.h
index 998b7d6f..998b7d6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30030-Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30030-Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30031-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30031-operator.cpp
index f17b865d..f17b865d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30031-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30031-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30032-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30032-operator.cpp
index cfa98ca1..cfa98ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30032-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30032-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30033-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30033-operator.cpp
index 976d919f..976d919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30033-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30033-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30034-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30034-operator_proto.cpp
index 3e5af195..3e5af195 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30034-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30034-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30035-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30035-operator_proto.cpp
index 3824798c..3824798c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30035-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30035-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30036-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30036-operator.cpp
index b1468795..b1468795 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30036-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30036-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30037-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30037-operator_proto.cpp
index d5c7e8fc..d5c7e8fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30037-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30037-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30038-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30038-operator.cpp
index a1bfafe3..a1bfafe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30038-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30038-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30039-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30039-operator_proto.cpp
index 4ec0acf1..4ec0acf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30039-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30039-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30040-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30040-nl-class.h
index 9ccbcf75..9ccbcf75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30040-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30040-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30041-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30041-nl-class.h
index 57e47625..57e47625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30041-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30041-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30042-Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30042-Issue_2020.cpp
index d618f922..d618f922 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30042-Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30042-Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30043-nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
index fbf89d16..fbf89d16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
index 4495d667..4495d667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30045-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30045-nl_func_decl.cpp
index 81d0a00e..81d0a00e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30045-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30045-nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30046-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30046-nl_func_decl.cpp
index 498970a3..17aa59f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30046-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30046-nl_func_decl.cpp
@@ -32,7 +32,8 @@ void ble( int a, char b )
 
 }
 
-void ble2( int a, char b )
+void ble2( int  a,
+           char b )
 {
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
index e8a947c9..e8a947c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
index 22f3c700..22f3c700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30049-nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
index 847b7037..847b7037 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30050-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30050-nl-namespace.h
index e515b479..e515b479 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30050-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30050-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30051-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30051-nl-namespace.h
index c51d75be..c51d75be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30051-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30051-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30052-try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30052-try-catch-nl.cpp
index 410a735e..410a735e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30052-try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30052-try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30053-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30053-exception.cpp
index 2c41efbf..2c41efbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30053-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30053-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30054-Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30054-Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30054-Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30054-Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30055-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30055-nl_func.cpp
index 142e6895..142e6895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30055-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30055-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30056-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30056-nl_func.cpp
index f930b703..f930b703 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30056-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30056-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30057-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30058-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30059-Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30059-Issue_2186.cpp
index 2c3081ea..2c3081ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30059-Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30059-Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30060-Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30060-Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30060-Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30060-Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30061-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30061-class-init.cpp
index 7ce41d09..7ce41d09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30061-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30061-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30062-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30062-class-init.cpp
index 53ce4a31..53ce4a31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30062-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30062-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30063-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30063-class-init.cpp
index ad278c90..ad278c90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30063-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30063-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30064-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30064-class-init.cpp
index c44bdfd3..c44bdfd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30064-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30064-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30065-Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30065-Example.h
index 1a868d10..1a868d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30065-Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30065-Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30066-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30066-class-init.cpp
index 1fc8bb57..1fc8bb57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30066-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30066-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30067-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30067-nl_func_type_name.cpp
index a30a08e9..a30a08e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30067-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30067-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30068-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
index 1e4caa86..1e4caa86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30069-class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30069-class-implementation.cpp
index 18481338..18481338 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30069-class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30069-class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30070-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
index c14a06ed..c14a06ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30071-lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30072-lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30072-lineEndings-Win.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30072-lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30072-lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30073-lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30074-bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30074-bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30074-bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30074-bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30075-goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30075-goto.cpp
index 4cccfe2c..4cccfe2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30075-goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30075-goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30076-Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30076-Issue_2594.cpp
index 240e19db..240e19db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30076-Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30076-Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30077-Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30077-Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30077-Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30077-Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30078-Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30078-Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30078-Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30078-Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30079-Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30079-Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30079-Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30079-Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30080-nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30080-nl_brace_brace.cpp
index a9783697..a9783697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30080-nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30080-nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30081-Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30081-Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30081-Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30081-Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30082-Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30082-Issue_931.cpp
index 76a6b856..76a6b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30082-Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30082-Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30083-Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30083-Issue_995-do.cpp
index 2e84d7ce..2e84d7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30083-Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30083-Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30084-Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30084-Issue_1184.cpp
index 848b1e03..848b1e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30084-Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30084-Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30085-align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30085-align_class.cpp
index 552d6947..552d6947 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30085-align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30085-align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30086-align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30086-align_class-constr.cpp
index f6082028..f6082028 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30086-align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30086-align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30087-Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30087-Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30087-Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30087-Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30088-Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30088-Issue_2561.cpp
index aa566966..aa566966 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30088-Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30088-Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30089-Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30089-Issue_2281.cpp
index e0d8727d..e0d8727d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30089-Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30089-Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30090-bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30090-bug_488.cpp
index 268d5ba4..268d5ba4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30090-bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30090-bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30091-bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30091-bug_472.cpp
index e48251fe..e48251fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30091-bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30091-bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30092-bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30092-bug_481.cpp
index 99d8c390..99d8c390 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30092-bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30092-bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30093-bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30093-bug_484.cpp
index 875ff3d2..875ff3d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30093-bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30093-bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30094-bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30094-bug_495.cpp
index d7db1238..d7db1238 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30094-bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30094-bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30095-bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30095-bug_485.cpp
index b5e7842c..b5e7842c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30095-bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30095-bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30096-bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30096-bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30096-bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30096-bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30097-issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30097-issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30097-issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30097-issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30098-Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30098-Issue_2692.cpp
index c54e5461..c54e5461 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30098-Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30098-Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30099-bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30099-bug_1127.cpp
index 0109baaf..0109baaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30099-bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30099-bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30100-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30100-templates.cpp
index 6874e3dd..6874e3dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30100-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30100-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30101-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30101-templates.cpp
index 1de728b9..1de728b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30101-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30101-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30102-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30102-templates.cpp
index 54b403fe..54b403fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30102-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30102-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30103-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30103-templates.cpp
index 19d12ef7..19d12ef7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30103-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30103-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30104-templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30104-templ_class.h
index 802f7e27..802f7e27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30104-templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30104-templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30105-av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30105-av.h
index 6efe8e9b..6efe8e9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30105-av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30105-av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30106-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30106-templates2.cpp
index 48f56d99..48f56d99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30106-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30106-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30107-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30107-templates2.cpp
index a49d4381..a49d4381 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30107-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30107-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30108-templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30108-templates3.cpp
index a0e20d19..a0e20d19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30108-templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30108-templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30109-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30109-templates4.cpp
index 781822e8..781822e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30109-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30109-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30110-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30110-class-init.cpp
index e1b1949c..e1b1949c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30110-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30110-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30111-bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30111-bug_1346.h
index 2ca31e50..2ca31e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30111-bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30111-bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30112-bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30112-bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30112-bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30112-bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30113-bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30113-bug_1452.cpp
index 59a3babd..59a3babd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30113-bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30113-bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30114-bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30114-bug_1462.cpp
new file mode 100644
index 00000000..b6a33ceb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30114-bug_1462.cpp
@@ -0,0 +1,26 @@
+#include <type_traits>
+
+template<
+   typename ... Args,
+   typename E = typename std::enable_if<(sizeof...(Args) >= 1), bool>::type
+   >
+void fun1(Args&& ... args)
+{
+}
+
+template<
+   typename ... Args,
+   typename E = typename std::enable_if<(sizeof...(Args) > 1), bool>::type
+   >
+void fun2(Args&& ... args)
+{
+}
+
+template<
+   typename ... Args,
+   typename E = typename std::enable_if<(sizeof...(Args) < 3), bool>::type
+   >
+void fun3(Args&& ... args)
+{
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30115-Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30115-Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30115-Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30115-Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30116-Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30116-Issue_1052.cpp
index 0e21f136..0e21f136 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30116-Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30116-Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30117-Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30117-Issue_2343.cpp
index a82e1172..a82e1172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30117-Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30117-Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30118-Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30118-Issue_2758.cpp
index 576b1bef..576b1bef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30118-Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30118-Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30119-Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30119-Issue_2879.cpp
index fbc323ae..fbc323ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30119-Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30119-Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30120-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30120-sp_after_angle.cpp
index 04af5289..04af5289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30120-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30120-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30121-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30121-sp_after_angle.cpp
index 8764578e..8764578e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30121-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30121-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30122-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30122-sp_after_angle.cpp
index 8514bccb..8514bccb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30122-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30122-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30123-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30123-sp_after_angle.cpp
index 2da08a67..2da08a67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30123-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30123-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30124-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30124-sp_after_angle.cpp
index 88e659cd..88e659cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30124-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30124-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30125-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30125-sp_after_angle.cpp
index 2da08a67..2da08a67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30125-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30125-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30126-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30126-sp_after_angle.cpp
index 7710171e..7710171e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30126-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30126-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30127-Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30127-Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30127-Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30127-Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30128-Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30128-Issue_2873.cpp
index 6803fd9a..6803fd9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30128-Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30128-Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30129-Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30129-Issue_2890.cpp
index d03e4f62..d03e4f62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30129-Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30129-Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30130-if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30130-if-constexpr.cpp
index 483317be..483317be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30130-if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30130-if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30131-Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30131-Issue_3010.cpp
new file mode 100644
index 00000000..93fd70db
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30131-Issue_3010.cpp
@@ -0,0 +1,16 @@
+namespace SomeLongNamespaceName {
+class Foo { };
+}
+
+class Bar : SomeLongNamespaceName::Foo {
+public:
+Bar()
+        : SomeLongNamespaceName::Foo(),
+        myNumber(3),      // <-- this line
+        myOtherNumber(5)
+{
+}
+private:
+int myNumber;
+int myOtherNumber;
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30132-sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30132-sp_brace_catch.cpp
new file mode 100644
index 00000000..04c1b9c1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30132-sp_brace_catch.cpp
@@ -0,0 +1,8 @@
+int foo()
+{
+	try { foo(bar); }catch (int *e) { return 0; }
+
+	if (false) try { throw int(); }catch(...) {}
+
+	return 1;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30200-bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30200-bug_1862.cpp
index c5357c86..c5357c86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30200-bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30200-bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30201-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30201-cmt_indent.cpp
index ed27ffca..ed27ffca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30201-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30201-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30202-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30202-cmt_indent.cpp
index 95c47d6e..95c47d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30202-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30202-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30203-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30203-cmt_indent.cpp
index 05cc2df3..05cc2df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30203-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30203-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30204-comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30204-comment-align.cpp
index afaaafef..afaaafef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30204-comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30204-comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30205-cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30205-cmt_right.cpp
index bcca4e2e..bcca4e2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30205-cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30205-cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
index d020e171..d020e171 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30207-cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30207-cmt_indent_pp.h
index 50e35c8d..50e35c8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30207-cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30207-cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30208-bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30208-bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30208-bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30208-bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30209-bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30209-bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30209-bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30209-bug_1134.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30210-bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30210-bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30210-bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30210-bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
index bc25f6b4..bc25f6b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
index abddd42e..abddd42e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30213-align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30213-align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30213-align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30213-align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30214-align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30214-align_across_braces.cpp
index 199ede8d..199ede8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30214-align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30214-align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30215-Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30215-Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30215-Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30215-Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30216-Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30216-Issue_2302.cpp
index e2684ae6..e2684ae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30216-Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30216-Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30217-2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30217-2138.cpp
index 8d1d7462..8d1d7462 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30217-2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30217-2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30218-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30218-trailing_return.cpp
index be70a23b..be70a23b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30218-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30218-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30219-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30219-trailing_return.cpp
index e250cbd5..e250cbd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30219-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30219-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30220-bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30220-bug_1340.cpp
index f64bc6a0..f64bc6a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30220-bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30220-bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30221-Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30221-Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30221-Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30221-Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30222-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30222-trailing_return.cpp
new file mode 100644
index 00000000..9c076282
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30222-trailing_return.cpp
@@ -0,0 +1,50 @@
+auto f0(int a, int b)  ->  int;
+
+struct Foo
+{
+	auto f01()  ->  bool;
+	auto f02() noexcept  ->  bool;
+	auto f03() noexcept(true)  ->  bool;
+	auto f04() noexcept(false)  ->  bool;
+	auto f05() noexcept  ->  bool=delete;
+	auto f06() noexcept(true)  ->  bool=delete;
+	auto f07() noexcept(false)  ->  bool=delete;
+
+	auto f11() const  ->  bool;
+	auto f12() const noexcept  ->  bool;
+	auto f13() const noexcept(true)  ->  bool;
+	auto f14() const noexcept(false)  ->  bool;
+	auto f15() const noexcept  ->  bool=delete;
+	auto f16() const noexcept(true)  ->  bool=delete;
+	auto f17() const noexcept(false)  ->  bool=delete;
+
+	auto f21() throw()  ->  bool;
+	auto f22() throw()  ->  bool=delete;
+	auto f23() const throw()  ->  bool;
+	auto f24() const throw()  ->  bool=delete;
+};
+
+struct Bar
+{
+	Bar() : m_func([](void*)  ->  result_t {
+		return magic;
+	}) {}
+};
+
+void foo()
+{
+	auto l = [](int n)  ->  x_t {
+			 return n + 5;
+		 };
+	x([](int n)  ->  x_t {
+		return n + 5;
+	});
+}
+
+static auto f25()  ->  bool {
+	return true;
+}
+
+static auto f26() const noexcept(true)  ->  bool {
+	return true;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30223-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30223-sp_enum_colon.cpp
new file mode 100644
index 00000000..11d7320b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30223-sp_enum_colon.cpp
@@ -0,0 +1,10 @@
+enum Enum1 : int {
+	E31=0,
+	E32=1,
+	E33=2
+};
+enum Enum2 : int {
+	E31=0,
+	E32=1,
+	E33=2
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30224-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30224-sp_enum_colon.cpp
new file mode 100644
index 00000000..804fe1ae
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30224-sp_enum_colon.cpp
@@ -0,0 +1,10 @@
+enum Enum1:int {
+	E31=0,
+	E32=1,
+	E33=2
+};
+enum Enum2:int {
+	E31=0,
+	E32=1,
+	E33=2
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30230-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30230-sp_type_func.cpp
index 0d17364f..0d17364f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30230-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30230-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30231-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30231-sp_type_func.cpp
index d7d69cc8..d7d69cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30231-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30231-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30232-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30232-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30232-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30232-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30233-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30233-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30233-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30233-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30234-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30234-functype_param.cpp
index 32419616..32419616 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30234-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30234-functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30235-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30235-functype_param.cpp
index 9e9f5ecc..9e9f5ecc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30235-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30235-functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30240-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30240-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30240-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30240-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30241-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30241-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30241-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30241-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30242-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30242-align_func_params.cpp
index 512233cd..512233cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30242-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30242-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30243-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30243-align_func_params.cpp
index 82434066..82434066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30243-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30243-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30244-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30244-align_func_params.cpp
index 5efed666..5efed666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30244-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30244-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30245-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30245-align_func_params.cpp
index a44170a9..a44170a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30245-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30245-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30246-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30246-align_func_params.cpp
index 9def11e6..9def11e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30246-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30246-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30247-Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30247-Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30247-Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30247-Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30248-Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30248-Issue_2831.cpp
index c099567a..c099567a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30248-Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30248-Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30249-align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30249-align-330.cpp
index a92e1545..a92e1545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30249-align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30249-align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30250-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30250-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30250-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30250-align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30251-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30251-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30251-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30251-align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30253-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30253-align_left_shift.cpp
index 7c98226d..7c98226d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30253-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30253-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30254-align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30254-align_left_shift2.cpp
index bfea744c..bfea744c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30254-align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30254-align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30255-align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30255-align_constr.cpp
index 380f0c8b..380f0c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30255-align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30255-align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30256-func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30256-func_call.cpp
index e3eff88c..e3eff88c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30256-func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30256-func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30257-func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30257-func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30257-func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30257-func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30258-casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30258-casts.cpp
index d8a496fb..d8a496fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30258-casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30258-casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
index 7b63b639..7b63b639 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30260-var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30260-var_def_gap.cpp
index 7333d292..7333d292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30260-var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30260-var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30261-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
index 8512377e..8512377e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30262-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
index 4996a3d3..4996a3d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30263-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
index 1e10f370..1e10f370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30264-Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30264-Issue_2668.cpp
index da8e118f..da8e118f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30264-Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30264-Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30265-long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30265-long_br_cmt.cpp
index 8ebdcec9..8ebdcec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30265-long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30265-long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30266-Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30266-Issue_2921.cpp
index 53e3c495..53e3c495 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30266-Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30266-Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30267-Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30267-Issue_2930.cpp
index 00cff53b..00cff53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30267-Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30267-Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30268-Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30268-Issue_3018.cpp
new file mode 100644
index 00000000..ddbb473e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30268-Issue_3018.cpp
@@ -0,0 +1,7 @@
+class Class
+{
+int fa();
+int* fpa();
+int fb();
+int& frb();
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30270-const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30270-const_throw.cpp
index 44f0ca68..44f0ca68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30270-const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30270-const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30271-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30271-sp_throw_paren.cpp
index 21ce9291..21ce9291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30271-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30271-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30272-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30272-sp_throw_paren.cpp
index ea851aff..ea851aff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30272-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30272-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
index ee0d705b..ee0d705b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
index 93cc7f86..93cc7f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30275-bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30275-bug_1321.cpp
index 5e708c11..5e708c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30275-bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30275-bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30278-bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30278-bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30278-bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30278-bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
index c8b92481..c8b92481 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30280-sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30280-sf557.cpp
index 287bc9c1..287bc9c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30280-sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30280-sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30281-Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30281-Issue_2478.cpp
index 40674590..40674590 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30281-Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30281-Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30282-Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30282-Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30282-Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30282-Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30290-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30290-align_left_shift.cpp
index 8591a642..8591a642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30290-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30290-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30291-indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30291-indent_shift.cpp
index bc1ae2e5..bc1ae2e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30291-indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30291-indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30292-eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30292-eigen.cpp
index aa43434a..aa43434a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30292-eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30292-eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30293-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30293-pos_shift.cpp
index d4a8f1ed..d4a8f1ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30293-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30293-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30294-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30294-pos_shift.cpp
index badc9798..badc9798 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30294-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30294-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30295-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30295-pos_shift.cpp
index efb19263..efb19263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30295-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30295-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30300-enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30300-enum_shr.cpp
index 26e0d08e..26e0d08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30300-enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30300-enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30301-enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30301-enum_class.h
index 7ad5e9ea..7ad5e9ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30301-enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30301-enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30302-bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30302-bug_1315.cpp
index 584f9a00..584f9a00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30302-bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30302-bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30303-Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30303-Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30303-Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30303-Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30310-braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30310-braced_init_list.cpp
index d67a918e..116462c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30310-braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30310-braced_init_list.cpp
@@ -252,7 +252,7 @@ void braced_init_list_lambda()
         std::vector<some_type> a {1, 2};
         some_type b {2};
 
-        auto c = [] {
+        auto c = []{
                          return true;
                  };
         auto d = [](){
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30311-uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30311-uniform_initialization.cpp
index 64da585d..64da585d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30311-uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30311-uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30312-return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30312-return_init_list.cpp
index ef91c528..ef91c528 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30312-return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30312-return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30313-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30313-sp_brace_brace.cpp
index 2ae91737..2ae91737 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30313-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30313-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30314-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30314-sp_brace_brace.cpp
index b7ca9839..b7ca9839 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30314-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30314-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30315-return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30315-return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30315-return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30315-return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30316-Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30316-Issue_2428.cpp
index b2a0a139..b2a0a139 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30316-Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30316-Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
index 3c22d790..3c22d790 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30318-Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30318-Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30318-Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30318-Issue_2949.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30319-Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30319-Issue_2886.cpp
new file mode 100644
index 00000000..0474c710
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30319-Issue_2886.cpp
@@ -0,0 +1 @@
+ValuePrimaryKey<int64_t, Schema, ColumnId1{0}> id = { kTableName, kColumnNameId };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30320-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30320-returns.cpp
index 1999355b..1999355b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30320-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30320-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30321-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30321-returns.cpp
index 5dcdfafd..5dcdfafd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30321-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30321-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30322-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30322-returns.cpp
index 68218f60..68218f60 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30322-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30322-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30323-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30323-returns.cpp
index 3360b493..3360b493 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30323-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30323-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30324-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30324-returns.cpp
index d1fa77be..d1fa77be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30324-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30324-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30325-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30325-returns.cpp
index 95e4f22c..95e4f22c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30325-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30325-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30326-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30326-indent_off_after_return.cpp
index 5c81f9e1..6cd6d8e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30326-indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30326-indent_off_after_return.cpp
@@ -36,3 +36,25 @@ int foo5()
 			)
 		);
 }
+
+int foo6()
+{
+	auto my_lambda = [] ()
+			 {
+				 return 1 +
+				 2 +
+				 3;
+
+			 };
+}
+
+template<typename U>
+U *
+find(const std::string &name = "") const
+{
+	return find<U>([&name] (auto *pComposite)
+	{
+		return name.empty() ||
+		pComposite->getName() == name;
+	});
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30327-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30327-indent_off_after_return.cpp
new file mode 100644
index 00000000..6cd6d8e4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30327-indent_off_after_return.cpp
@@ -0,0 +1,60 @@
+int foo1()
+{
+	return std::pair<int, int>{
+		1, 2
+	}.first;
+}
+
+int foo2()
+{
+	return
+	int{3} & 2;
+}
+
+int foo3()
+{
+	constexpr static int x = 3;
+	return
+	decltype(x) {x} & 2;
+}
+
+int foo4()
+{
+	return
+	new Type();
+}
+
+int foo5()
+{
+	return
+	veryLongMethodCall(
+		arg1,
+		longMethodCall(
+			methodCall(
+				arg2, arg3
+				), arg4
+			)
+		);
+}
+
+int foo6()
+{
+	auto my_lambda = [] ()
+			 {
+				 return 1 +
+				 2 +
+				 3;
+
+			 };
+}
+
+template<typename U>
+U *
+find(const std::string &name = "") const
+{
+	return find<U>([&name] (auto *pComposite)
+	{
+		return name.empty() ||
+		pComposite->getName() == name;
+	});
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30328-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
new file mode 100644
index 00000000..b75c35b1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
@@ -0,0 +1,33 @@
+void bar()
+{
+	foo(42, {1, 2, 3, 4});
+	foo(42,
+	    {1, 2, 3, 4});
+
+	foo(42, vector
+	    {1, 2, 3, 4});
+	foo(42,
+	    vector
+	    {1, 2, 3, 4});
+	foo(42, vector
+	    {1, 2, 3, 4});
+
+	foo(42, vector<int>
+	    {1, 2, 3, 4});
+	foo(42,
+	    vector<int>
+	    {1, 2, 3, 4});
+	foo(42, vector<int>
+	    {1, 2, 3, 4});
+	foo(42, vector
+	    <int>
+	    {1, 2, 3, 4});
+
+	foo(42, decltype(something)
+	    {1, 2, 3, 4});
+	foo(42,
+	    decltype(something)
+	    {1, 2, 3, 4});
+	foo(42, decltype(something)
+	    {1, 2, 3, 4});
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30329-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
new file mode 100644
index 00000000..83837910
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
@@ -0,0 +1,23 @@
+void bar()
+{
+	foo(42, {1, 2, 3, 4});
+	foo(42,
+	    {1, 2, 3, 4});
+
+	foo(42, vector{1, 2, 3, 4});
+	foo(42,
+	    vector{1, 2, 3, 4});
+	foo(42, vector{1, 2, 3, 4});
+
+	foo(42, vector<int>{1, 2, 3, 4});
+	foo(42,
+	    vector<int>{1, 2, 3, 4});
+	foo(42, vector<int>{1, 2, 3, 4});
+	foo(42, vector
+	    <int>{1, 2, 3, 4});
+
+	foo(42, decltype(something) {1, 2, 3, 4});
+	foo(42,
+	    decltype(something) {1, 2, 3, 4});
+	foo(42, decltype(something) {1, 2, 3, 4});
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30330-Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30330-Issue_3080.cpp
new file mode 100644
index 00000000..75c6072b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30330-Issue_3080.cpp
@@ -0,0 +1,2 @@
+auto j = int{0};
+auto j = decltype(int){0};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
index 15cc6e3a..15cc6e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30401-Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30401-Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30401-Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30401-Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30701-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30701-function-def.cpp
index 89261c8e..89261c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30701-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30701-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30702-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30702-function-def.cpp
index c1fb4ed4..c1fb4ed4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30702-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30702-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30703-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30703-function-def.cpp
index c604152d..c604152d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30703-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30703-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30705-func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30705-func_param.cpp
index 8bdb0ce8..8bdb0ce8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30705-func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30705-func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30706-bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30706-bug_1020.cpp
index f0e9e60d..f0e9e60d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30706-bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30706-bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30711-semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30711-semicolons.cpp
index de28deef..de28deef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30711-semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30711-semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30712-bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30712-bug_1158.cpp
index 2a9ba76d..2a9ba76d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30712-bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30712-bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
index 890f2eba..890f2eba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30714-Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30714-Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30714-Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30714-Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30715-Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30715-Issue_2942.cpp
index dbecc7f4..dbecc7f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30715-Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30715-Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30720-custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30720-custom-open-2.cpp
index 4d05944a..4d05944a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30720-custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30720-custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30721-Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30721-Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30721-Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30721-Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30730-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30730-qt-1.cpp
index 5d0273e2..5d0273e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30730-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30730-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30731-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30731-qt-1.cpp
index 55b2459b..55b2459b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30731-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30731-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30732-Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30732-Issue_2734.cpp
index 27dfdc70..27dfdc70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30732-Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30732-Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30740-sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30740-sef.cpp
index 8730ba15..8730ba15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30740-sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30740-sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30741-al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30741-al.cpp
index 1c911bf2..1c911bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30741-al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30741-al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30742-delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30742-delete.cpp
index c33aa682..c33aa682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30742-delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30742-delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30744-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30744-Issue_2170.cpp
index f1edafd8..f1edafd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30744-Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30744-Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30745-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30745-Issue_2170.cpp
index f1edafd8..f1edafd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30745-Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30745-Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30746-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
index 7dff7dd5..7dff7dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30747-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
index 30d315a7..30d315a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30748-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
index 9b55a964..9b55a964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30750-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30750-lambda.cpp
index 91f87a91..84bafe26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30750-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30750-lambda.cpp
@@ -39,7 +39,7 @@ void f3a()
 {
    auto a = []  {
             };
-   auto b = [] {
+   auto b = []{
                return(true);
             };
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30751-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30751-lambda.cpp
index f277ade7..be202237 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30751-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30751-lambda.cpp
@@ -1,7 +1,7 @@
 void f1()
 {
    auto a =
-      [=] (int *a, Something& b) {
+      [=] (int *a, Something& b){
          std::cout << "blah: " << *a;
       };
 }
@@ -9,7 +9,7 @@ void f1()
 void f1a()
 {
    std::for_each(a, b,
-                 [] (Something& b) {
+                 [] (Something& b){
       std::cout << "blah: " << *a;
    });
 }
@@ -26,7 +26,7 @@ void f1b()
 void f2()
 {
    Invoke(a, b,
-          [&one, two] (int *a, Something& b) {
+          [&one, two] (int *a, Something& b){
       std::cout << "blah: " << *a;
    });
 }
@@ -34,13 +34,13 @@ void f2()
 void f3a()
 {
    auto a = []  {};
-   auto b = [] { return(true); };
+   auto b = []{ return(true); };
 }
 
 void f3b()
 {
    Invoke(a, b,
-          [&one, two] {
+          [&one, two]{
       std::cout << "blah: " << one << two;
    });
 }
@@ -52,12 +52,12 @@ void f3c()
 
 void g1()
 {
-   auto a = [=] (int *a, Something&b) { std::cout << "blah: " << *a; };
+   auto a = [=] (int *a, Something&b)  { std::cout << "blah: " << *a; };
 }
 
 void g1a()
 {
-   std::for_each(a, b, [] (Something& b) { std::cout << "blah: " << *a; });
+   std::for_each(a, b, [] (Something& b){ std::cout << "blah: " << *a; });
 }
 
 void g1b()
@@ -68,5 +68,5 @@ void g1b()
 void g2()
 {
    Invoke(a, b,
-          [&one, two] (int *a, Something&b) { std::cout << "blah: " << *a; });
+          [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30752-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30752-lambda.cpp
index 84ca8b21..84ca8b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30752-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30752-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30753-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30753-lambda2.cpp
index ccc2a2ed..2bcfff9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30753-lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30753-lambda2.cpp
@@ -1,7 +1,7 @@
 void f1()
 {
    auto a =
-      [=] (int *a, Something& b) {
+      [=] (int *a, Something& b){
          std::cout << "blah: " << *a;
       };
 }
@@ -9,7 +9,7 @@ void f1()
 void f1a()
 {
    std::for_each(a, b,
-                 [] (Something& b) {
+                 [] (Something& b){
                     std::cout << "blah: " << *a;
                  }
                  );
@@ -28,7 +28,7 @@ void f1b()
 void f2()
 {
    Invoke(a, b,
-          [&one, two] (int *a, Something& b) {
+          [&one, two] (int *a, Something& b){
              std::cout << "blah: " << *a;
           }
           );
@@ -37,13 +37,13 @@ void f2()
 void f3a()
 {
    auto a = [] {};
-   auto b = [] { return(true); };
+   auto b = []{ return(true); };
 }
 
 void f3b()
 {
    Invoke(a, b,
-          [&one, two] {
+          [&one, two]{
              std::cout << "blah: " << one << two;
           }
           );
@@ -61,7 +61,7 @@ void g1()
 
 void g1a()
 {
-   std::for_each(a, b, [] (Something& b) { std::cout << "blah: " << *a; });
+   std::for_each(a, b, [] (Something& b){ std::cout << "blah: " << *a; });
 }
 
 void g1b()
@@ -72,5 +72,5 @@ void g1b()
 void g2()
 {
    Invoke(a, b,
-          [&one, two] (int *a, Something&b) { std::cout << "blah: " << *a; });
+          [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30754-bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30754-bug_i_682.h
index 51c58e23..51c58e23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30754-bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30754-bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30755-bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30755-bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30755-bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30755-bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30756-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30756-bug_1296.cpp
index 482045df..482045df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30756-bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30756-bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30757-Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30757-Issue_3054.cpp
new file mode 100644
index 00000000..53edc388
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30757-Issue_3054.cpp
@@ -0,0 +1,7 @@
+void func()
+{
+  parallel_for(0, 100, [&](const int i){
+    const std::vector<int> values = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
+    return values[i];
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30758-Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30758-Issue_3054-2.cpp
new file mode 100644
index 00000000..e4c1c8da
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30758-Issue_3054-2.cpp
@@ -0,0 +1,9 @@
+void func()
+{
+  parallel_for(0, 100,
+               [&](int aaaaaa, int bbbbbbb, int ccccccc, int ddddddd,
+                   const int eee){
+    // do something
+    return a;
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30761-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30761-out-668.cpp
index 8829c0ce..8829c0ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30761-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30761-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30762-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30762-out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30762-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30762-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30763-Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30763-Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30763-Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30763-Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30764-Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30764-Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30764-Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30764-Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30770-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30770-lambda.cpp
index d43a6e37..44f277c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30770-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30770-lambda.cpp
@@ -39,7 +39,7 @@ void f3a()
 {
 	auto a = []  {
 		 };
-	auto b = [] {
+	auto b = []{
 			 return true;
 		 };
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30771-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30771-lambda.cpp
index 2f2fe01a..49c4d96f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30771-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30771-lambda.cpp
@@ -39,7 +39,7 @@ void f3a()
 {
 	auto a = []  {
 		 };
-	auto b = [] {
+	auto b = []{
 			 return true;
 		 };
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30772-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30772-lambda.cpp
index 0c834f22..0c834f22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30772-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30772-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30773-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30773-lambda.cpp
index 5389b7ec..5389b7ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30773-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30773-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30774-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30774-lambda.cpp
index 34b8839e..f91770c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30774-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30774-lambda.cpp
@@ -39,7 +39,7 @@ void f3a()
 {
 	auto a = []  {
 		 };
-	auto b = [] {
+	auto b = []{
 			 return true;
 		 };
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30775-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30775-lambda.cpp
index c2731c35..9847c201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30775-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30775-lambda.cpp
@@ -39,7 +39,7 @@ void f3a()
 {
 	auto a = []  {
 		 };
-	auto b = [] {
+	auto b = []{
 			 return true;
 		 };
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
index e0c1985d..e0c1985d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
index f882a211..f882a211 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30781-lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30781-lambda_brace_list.cpp
new file mode 100644
index 00000000..8626f5af
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30781-lambda_brace_list.cpp
@@ -0,0 +1,9 @@
+template<typename T, typename U>
+auto add(T t, U u) -> decltype(t + u) { return t + u; }
+
+int main()
+{
+	auto f1 = [&]() { return 1; };
+	auto f2 = [&]() -> decltype(auto) { return 2; };
+	string s1{'a', 'b'};
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30790-Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30790-Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30790-Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30790-Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30800-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
index dc988ce1..dc988ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30801-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
index c23b0d4a..c23b0d4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30802-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
index cf2bff2d..cf2bff2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30803-bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30803-bug_1403.cpp
index 209c0173..209c0173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30803-bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30803-bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30804-block_pointer.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30804-block_pointer.cpp
index fc44e403..fc44e403 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30804-block_pointer.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30804-block_pointer.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30805-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30805-ptr-star.cpp
index fcefa84f..fcefa84f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30805-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30805-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30806-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30806-ptr-star.cpp
index 1a7586cc..1a7586cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30806-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30806-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30807-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30807-ptr-star.cpp
index f7ee88f7..f7ee88f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30807-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30807-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30808-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30808-ptr-star.cpp
index 68cb8151..68cb8151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30808-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30808-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30809-bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30809-bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30809-bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30809-bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30810-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30810-ptr-star.cpp
index 1309beec..1309beec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30810-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30810-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30811-misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30811-misc3.cpp
index 68375327..68375327 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30811-misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30811-misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30812-misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30812-misc4.cpp
index 5ddaffb0..5ddaffb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30812-misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30812-misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30813-misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30813-misc5.cpp
index e8ffaf27..e8ffaf27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30813-misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30813-misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30814-misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30814-misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30814-misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30814-misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30815-cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30815-cmt-reflow.cpp
index 8bd50283..8bd50283 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30815-cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30815-cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30816-for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30816-for_long.cpp
index 5483d4c8..5483d4c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30816-for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30816-for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
index 9acbac58..9acbac58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30818-bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30818-bug_1169.cpp
index b1138a57..b1138a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30818-bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30818-bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30819-bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30819-bug_1170.cpp
index 18e029cb..18e029cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30819-bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30819-bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30820-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30820-pp-define-indent.cpp
index 0d7892a2..0d7892a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30820-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30820-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30821-pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30821-pp_indent_case.cpp
index 70b1b9c7..70b1b9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30821-pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30821-pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30822-pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30822-pp_indent_brace.cpp
index 4900fa34..4900fa34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30822-pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30822-pp_indent_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30823-pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
index b01c6bbe..b01c6bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30824-pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30824-pp_indent_extern.cpp
index 995db611..995db611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30824-pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30824-pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30825-Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30825-Issue_1966.cpp
index 12a8084b..12a8084b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30825-Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30825-Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30826-Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30826-Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30826-Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30826-Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30827-Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30827-Issue_1167.cpp
index 6410326c..6410326c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30827-Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30827-Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30828-bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30828-bug_1691.cpp
index e93f7f74..e93f7f74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30828-bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30828-bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30829-Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30829-Issue_2726.cpp
index bb7f1d4b..bb7f1d4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30829-Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30829-Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30830-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30830-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30830-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30830-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30831-kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30831-kw_subst2.cpp
index b5e58eac..b5e58eac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30831-kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30831-kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30832-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30832-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30832-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30832-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30840-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30840-nl_func_type_name.cpp
index a4302001..a4302001 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30840-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30840-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30841-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30841-nl_func_type_name.cpp
index 5997a5c3..5997a5c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30841-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30841-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30842-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30842-nl_func_type_name.cpp
index a826af48..a826af48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30842-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30842-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30843-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30843-nl_func_type_name.cpp
index b1ead857..b1ead857 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30843-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30843-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30844-Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30844-Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30844-Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30844-Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30845-deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30845-deref.cpp
index 9705b51f..9705b51f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30845-deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30845-deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
index 9cc04a18..9cc04a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30852-Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30852-Issue_2138.cpp
index 3a8fa83c..3a8fa83c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30852-Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30852-Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30853-noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30853-noexcept.cpp
index 60f2edd4..60f2edd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30853-noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30853-noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30854-Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30854-Issue_1703.cpp
index af32d661..af32d661 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30854-Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30854-Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30855-cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30855-cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30855-cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30855-cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
new file mode 100644
index 00000000..dc9e4160
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
@@ -0,0 +1,9 @@
+// BEGIN real region
+
+int foo()
+{
+	int x = 0; //BEGIN not-region
+	return x; //END not-region
+}
+
+// END real region
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
new file mode 100644
index 00000000..29f75936
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
@@ -0,0 +1,9 @@
+//BEGIN real region
+
+int foo()
+{
+	int x = 0; // BEGIN not-region
+	return x; // END not-region
+}
+
+//END real region
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30860-sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30860-sf574.cpp
index 58810404..58810404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30860-sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30860-sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30870-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30870-cmt_insert.cpp
index cf5ac204..cf5ac204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30870-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30870-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30871-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30871-cmt_insert.cpp
index a169795a..a169795a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30871-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30871-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30872-Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30872-Issue_2752.cpp
index b305b50f..b305b50f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30872-Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30872-Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30880-bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30880-bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30880-bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30880-bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30881-bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30881-bug_1758-f.cpp
index 24bb563b..24bb563b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30881-bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30881-bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30900-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30900-region.cpp
index 27823ca6..27823ca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30900-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30900-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30901-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30901-region.cpp
index b7bebae8..b7bebae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30901-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30901-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30902-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30902-region.cpp
index 39b20ea6..39b20ea6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30902-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30902-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30903-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30903-region.cpp
index d6e3403a..d6e3403a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30903-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30903-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30907-Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30907-Issue_1813.cpp
index d5a3cc71..d5a3cc71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30907-Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30907-Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30908-Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30908-Issue_1813-2.cpp
index 310de82f..310de82f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30908-Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30908-Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30909-Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30909-Issue_1813-3.cpp
index 08c8405d..08c8405d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30909-Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30909-Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30910-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30910-indent_namespace.h
index d569a3ca..d569a3ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30910-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30910-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30911-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30911-indent_namespace.h
index 6f80dc3b..6f80dc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30911-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30911-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30912-long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30912-long_namespace.cpp
index 80af6e83..80af6e83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30912-long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30912-long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30913-indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30913-indent_namespace2.h
index 196b2322..196b2322 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30913-indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30913-indent_namespace2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30914-indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
index 24a9b935..24a9b935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30915-bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30915-bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30915-bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30915-bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30916-Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30916-Issue_1737.cpp
index 06b0866b..06b0866b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30916-Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30916-Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30917-Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30917-Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30917-Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30917-Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30918-Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30918-Issue_2345-4.cpp
index f82d757d..f82d757d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30918-Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30918-Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30919-Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30919-Issue_2387.cpp
index 526278d6..526278d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30919-Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30919-Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30920-indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30920-indent-off.cpp
index f9eccdb8..f9eccdb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30920-indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30920-indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30921-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30921-variadic-template.h
index f159e700..f159e700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30921-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30921-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30922-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30922-variadic-template.h
index cf213653..cf213653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30922-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30922-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30923-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30923-sf.2886991.cpp
index 61dc7c21..61dc7c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30923-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30923-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30924-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30924-sf.2886991.cpp
index ce5e0b93..ce5e0b93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30924-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30924-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30925-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30925-function-def.cpp
index 2d6df544..2d6df544 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30925-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30925-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30926-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30926-function-def.cpp
index 78b23a14..78b23a14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30926-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30926-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30927-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30927-function-def.cpp
index bceb00f6..bceb00f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30927-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30927-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30928-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30928-function-def.cpp
index b14ecb11..b14ecb11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30928-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30928-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30929-bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30929-bug_1324.cpp
index 1aca5762..1aca5762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30929-bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30929-bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30930-indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30930-indent_var_def.cpp
index 5b3ee4e2..5b3ee4e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30930-indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30930-indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30931-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
index c505389f..c505389f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30932-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
index 70b7304e..70b7304e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
index 8a775135..8a775135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
index 6af21978..6af21978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30935-indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30935-indent-misc.cpp
index ad8de7b0..ad8de7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30935-indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30935-indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30936-indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30936-indent_braces_no.h
index 725b0402..725b0402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30936-indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30936-indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30937-indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30937-indent_param.cpp
index 31569ec1..31569ec1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30937-indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30937-indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30938-indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30938-indent_switch_pp.cpp
index dd910c56..dd910c56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30938-indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30938-indent_switch_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
index a1453862..a1453862 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30940-case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30940-case-brace-remove.cpp
index cd163570..cd163570 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30940-case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30940-case-brace-remove.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30941-Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30941-Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30941-Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30941-Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30942-Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30942-Issue_1692.cpp
index 89de1d6a..89de1d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30942-Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30942-Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30943-Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30943-Issue_2735.cpp
index 3e292425..3e292425 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30943-Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30943-Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30944-sp_paren_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30944-sp_paren_comma.cpp
new file mode 100644
index 00000000..0cec2022
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30944-sp_paren_comma.cpp
@@ -0,0 +1,2 @@
+a(, 1);
+typedef SLIST_HEAD(, foo) foo_list_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30945-sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30945-sf.3266678.cpp
index 810b5105..810b5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30945-sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30945-sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30946-sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30946-sf.3315874.h
index 05161496..05161496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30946-sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30946-sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30947-bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30947-bug_1689.cpp
index 40d34d61..40d34d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30947-bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30947-bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30948-sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
index 4abfe954..4abfe954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30949-Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30949-Issue_2757.cpp
index ba83c29e..ba83c29e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30949-Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30949-Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
index 943d303b..943d303b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
index c7e25f1c..c7e25f1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
index ad0e38d5..ad0e38d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30953-constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30953-constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30953-constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30953-constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30954-Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30954-Issue_2305.cpp
index 7458b913..7458b913 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30954-Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30954-Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30955-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30955-indent_ctor_init.cpp
index dd700d3c..55982328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30955-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30955-indent_ctor_init.cpp
@@ -13,5 +13,5 @@ struct MyClass : public Foo,
 };
 
 struct TheirClass
-  : public Foo,
-    private Bar {};
+      : public Foo,
+        private Bar {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30956-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30956-indent_ctor_init.cpp
index 2d5e1735..29a146a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30956-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30956-indent_ctor_init.cpp
@@ -1,5 +1,6 @@
-struct MyClass : public Foo,
-                 private Bar {
+struct MyClass
+: public Foo,
+  private Bar {
   MyClass(
       int a,
       int b,
@@ -13,5 +14,5 @@ struct MyClass : public Foo,
 };
 
 struct TheirClass
-  : public Foo,
-    private Bar {};
+: public Foo,
+  private Bar {};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30957-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30957-class-init.cpp
index faa28873..faa28873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30957-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30957-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
index 8ff2405f..8ff2405f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30960-Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30960-Issue_2151.cpp
index d0ee05d2..d0ee05d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30960-Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30960-Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30961-Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30961-Issue_2232.cpp
index 7867820b..7867820b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30961-Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30961-Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30963-Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30963-Issue_2907.cpp
index c0192c4d..c0192c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30963-Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30963-Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30964-Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30964-Issue_2823.cpp
new file mode 100644
index 00000000..c633398f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30964-Issue_2823.cpp
@@ -0,0 +1,3 @@
+namespace farm::animal::chicken::leg
+{
+} // namespace farm::animal::chicken::leg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30970-Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30970-Issue_2219.cpp
index e08cb889..e08cb889 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30970-Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30970-Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30971-Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30971-Issue_2224.cpp
index 0c454905..0c454905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30971-Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30971-Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30972-Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30972-Issue_2229.cpp
index 0c44ed6a..0c44ed6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30972-Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30972-Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30973-Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30973-Issue_2236.cpp
index 7f7f01f5..7f7f01f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30973-Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30973-Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30974-using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30974-using-alias-in-define.cpp
index 1b4153d8..1b4153d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/30974-using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/30974-using-alias-in-define.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31000-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31000-digraph.cpp
index e985dae6..e985dae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31000-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31000-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31001-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31001-digraph.cpp
index 641390a6..641390a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31001-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31001-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31562-sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31562-sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31562-sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31562-sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31567-sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31567-sf567.cpp
index 6d96731d..6d96731d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31567-sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31567-sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31568-Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31568-Issue_2368.cpp
index 82b8c59c..82b8c59c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31568-Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31568-Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31583-sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31583-sf583.cpp
index 34fc0c21..34fc0c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31583-sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31583-sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31593-sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31593-sf593.cpp
index 2d4499e6..2d4499e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31593-sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31593-sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31594-issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31594-issue_672.cpp
index 499f3168..499f3168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31594-issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31594-issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31595-issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31595-issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31595-issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31595-issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31596-issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31596-issue_1782.cpp
index 664ead7f..664ead7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31596-issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31596-issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31597-issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31597-issue_1804.cpp
index c98ecdef..c98ecdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31597-issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31597-issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31598-Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31598-Issue_1753.cpp
index 9f7da399..9f7da399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31598-Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31598-Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31600-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31600-parameter-packs.cpp
index 73940d29..73940d29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31600-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31600-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31601-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31601-parameter-packs.cpp
index 6153026f..6153026f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31601-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31601-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31602-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31602-parameter-packs.cpp
index 4fceb423..4fceb423 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31602-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31602-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31603-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31603-parameter-packs.cpp
index 8de4cbfe..8de4cbfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31603-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31603-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31604-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31604-parameter-packs.cpp
index a55fb45a..a55fb45a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31604-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31604-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31605-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31605-parameter-packs.cpp
index 544d9aa6..544d9aa6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31605-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31605-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31606-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31606-parameter-packs.cpp
index ae0537ca..ae0537ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31606-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31606-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31607-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31607-parameter-packs.cpp
index ce549a69..ce549a69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31607-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31607-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31608-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31608-parameter-packs.cpp
index 0f55018c..0f55018c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31608-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31608-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31609-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31609-parameter-packs.cpp
index cd8a5614..cd8a5614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31609-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31609-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31610-Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31610-Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31610-Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31610-Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31620-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31620-sp_after_type.cpp
index 460c0dc2..460c0dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31620-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31620-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31621-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31621-sp_after_type.cpp
index b1ffd02b..b1ffd02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31621-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31621-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31622-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31622-sp_after_type.cpp
index a924423a..a924423a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31622-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31622-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31623-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31623-sp_after_type.cpp
index 5d923c27..5d923c27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31623-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31623-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31624-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31624-sp_after_type.cpp
index b66aba0c..b66aba0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31624-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31624-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31625-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31625-sp_after_type.cpp
index add7b57e..add7b57e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31625-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31625-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31626-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31626-issue_1916.cpp
index 56ce6f4c..56ce6f4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31626-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31626-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31627-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31627-issue_1916.cpp
index f84334a4..f84334a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31627-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31627-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31628-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31628-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31628-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31628-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31629-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31629-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31629-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31629-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31630-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31630-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31630-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31630-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31631-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31631-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31631-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31631-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31632-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31632-issue_1916.cpp
index 292b6837..292b6837 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31632-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31632-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31633-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31633-sp_after_decltype.cpp
index 6a62e6f2..6a62e6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31633-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31633-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31634-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31634-sp_after_decltype.cpp
index c48543be..c48543be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31634-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31634-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31635-sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31635-sp_decltype.cpp
index 84b157f1..84b157f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31635-sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31635-sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31636-Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31636-Issue_1923.cpp
index 8c3ebe66..8c3ebe66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31636-Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31636-Issue_1923.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31660-issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31660-issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31660-issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31660-issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31661-Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31661-Issue_3097.cpp
new file mode 100644
index 00000000..336f8eaf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31661-Issue_3097.cpp
@@ -0,0 +1,9 @@
+void foo()
+{
+	for( unsigned p = 0; p < np;
+	     ++p )
+	{
+
+		double* o = bar[p];
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
new file mode 100644
index 00000000..03615082
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
@@ -0,0 +1,63 @@
+void func() {
+}
+
+// **ABC**
+void func() { }
+// *INDENT-ON*
+
+void func() {
+}
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the following form:
+ * \verbatim
+
+   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
+
+   where a, b, c, d, and e are real coefficients
+
+ * \endverbatim
+ *
+ * This object's tolerance defines a threshold for root solutions above which iterative methods will be employed to achieve the desired accuracy
+ *
+ * \verbatim - this should cause the following line to not wrap due to cmt_width
+ * Upon success, the roots array contains the solution to the polynomial p(x) = 0
+ * \endverbatim
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+int solve(double a,
+          double b,
+          double c,
+          double d,
+          double e,
+          std::complex<double> roots[4]);
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the following form:
+ *
+
+   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
+   where a, b, c, d, and e are real coefficients
+ *
+ * Upon success, root1, root2, root3, and root4 contain the solution to the polynomial p(x) = 0
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+/* **ABC** */
+              int solve(double a,
+    double b,
+                  double c,
+            double d,
+            double e,
+                     std::complex<double> &root1,
+                  std::complex<double> &root2,
+            std::complex<double> &root3,
+        std::complex<double> &root4);
+/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
index f67cb76b..f67cb76b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
new file mode 100644
index 00000000..adf1b8be
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
@@ -0,0 +1,68 @@
+void func() {
+}
+
+// **ABC**
+void func() { }
+// *INDENT-ON*
+
+void func() {
+}
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the
+ * following form:
+ * \verbatim
+
+   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
+
+   where a, b, c, d, and e are real coefficients
+
+ * \endverbatim
+ *
+ * This object's tolerance defines a threshold for root solutions
+ * above which iterative methods will be employed to achieve the
+ * desired accuracy
+ *
+ * \verbatim - this should cause the following line to not wrap due to cmt_width
+ * Upon success, the roots array contains the solution to the polynomial p(x) = 0
+ * \endverbatim
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+int solve(double a,
+          double b,
+          double c,
+          double d,
+          double e,
+          std::complex<double> roots[4]);
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the
+ * following form:
+ *
+ *
+ *  p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e, where a, b, c, d,
+ * and e are real coefficients
+ *
+ * Upon success, root1, root2, root3, and root4 contain the solution
+ * to the polynomial p(x) = 0
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+/* **ABC** */
+              int solve(double a,
+    double b,
+                  double c,
+            double d,
+            double e,
+                     std::complex<double> &root1,
+                  std::complex<double> &root2,
+            std::complex<double> &root3,
+        std::complex<double> &root4);
+/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
new file mode 100644
index 00000000..e806e89e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
@@ -0,0 +1,68 @@
+void func() {
+}
+
+// **ABC**
+void func() { }
+// *INDENT-ON*
+
+void func() {
+}
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the
+ * following form:
+ * \verbatim
+
+   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
+
+   where a, b, c, d, and e are real coefficients
+
+ * \endverbatim
+ *
+ * This object's tolerance defines a threshold for root solutions
+ * above which iterative methods will be employed to achieve the
+ * desired accuracy
+ *
+ * \verbatim - this should cause the following line to not wrap due to cmt_width
+ * Upon success, the roots array contains the solution to the polynomial p(x) = 0
+ * \endverbatim
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+int solve(double a,
+          double b,
+          double c,
+          double d,
+          double e,
+          std::complex<double> roots[4]);
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the
+ * following form:
+ *
+
+   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
+   where a, b, c, d, and e are real coefficients
+ *
+ * Upon success, root1, root2, root3, and root4 contain the solution
+ * to the polynomial p(x) = 0
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+/* **ABC** */
+              int solve(double a,
+    double b,
+                  double c,
+            double d,
+            double e,
+                     std::complex<double> &root1,
+                  std::complex<double> &root2,
+            std::complex<double> &root3,
+        std::complex<double> &root4);
+/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
index 56f16799..56f16799 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31720-bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31720-bit-colon.cpp
index b8e7c4db..b8e7c4db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31720-bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31720-bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31721-Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31721-Issue_2689.cpp
index e2b43674..e2b43674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31721-Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31721-Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31730-ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31730-ms-style-ref.cpp
index 826d4e90..826d4e90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31730-ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31730-ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31740-I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31740-I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/31740-I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/31740-I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
index 99d403ef..99d403ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32001-issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32001-issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32001-issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32001-issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32002-proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32002-proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32002-proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32002-proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32003-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32003-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32003-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32003-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32004-issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32004-issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32004-issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32004-issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32005-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32005-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32005-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32005-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32006-bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32006-bug_i_687.cpp
index 387eaa06..387eaa06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32006-bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32006-bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32007-Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32007-Issue_3052.cpp
new file mode 100644
index 00000000..cb468be3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32007-Issue_3052.cpp
@@ -0,0 +1,11 @@
+#define VTABLE_DECLARE                                            \
+	extern struct vtable_struct_name_macro vtable_base_macro; \
+	struct vtable_struct_name_macro
+
+#define VTABLE_METHOD(retvalue, method, args ...) \
+	retvalue(*method)(args)
+
+VTABLE_DECLARE {
+	VTABLE_METHOD(int, get, const char *name);
+	VTABLE_METHOD(int, set, const char *name, int value);
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32008-Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32008-Issue_3034.cpp
new file mode 100644
index 00000000..1a110ee8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32008-Issue_3034.cpp
@@ -0,0 +1,15 @@
+void main()
+{
+	while (*stringcur)
+	{
+#ifdef NO8BIT
+		if (((*bufcur++ ^ *stringcur) & 0x7F) != 0)
+#else /* NO8BIT */
+		if (*bufcur++ != *stringcur)
+#endif /* NO8BIT */ /* Issue #3034 */
+		{
+			break;
+		}
+	}
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32100-cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32100-cpp17.cpp
index cfccba03..cfccba03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32100-cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32100-cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32105-I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32105-I2103.cpp
index ba6386dd..ba6386dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32105-I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32105-I2103.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32115-2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32115-2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/32115-2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/32115-2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33000-tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33000-tab-0.cpp
index d9ff0418..d9ff0418 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33000-tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33000-tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33001-tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33001-tab-1.cpp
index 85d8abe2..85d8abe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33001-tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33001-tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
index db09e6fc..db09e6fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33004-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33004-DoxygenComments.cpp
index df0b9680..df0b9680 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33004-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33004-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33005-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33005-DoxygenComments.cpp
index 533214f2..533214f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33005-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33005-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33007-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33007-NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33007-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33007-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33008-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33008-NewLine.cpp
index b3cc1bed..b3cc1bed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33008-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33008-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33009-NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33009-NewLine0.cpp
index b5a714fa..b5a714fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33009-NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33009-NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33010-Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33010-Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33010-Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33010-Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33011-static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33011-static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33011-static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33011-static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
index faf00903..faf00903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33013-Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33013-Q_2.cpp
index 7d0bb88a..7d0bb88a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33013-Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33013-Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33014-DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33014-DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33014-DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33014-DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33015-Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33015-Q_FOREACH.cpp
index 02fd849d..02fd849d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33015-Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33015-Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33016-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33016-indent.cpp
index 22d04a78..22d04a78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33016-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33016-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33017-bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33017-bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33017-bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33017-bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33018-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33018-byref-2.cpp
index 665cc749..665cc749 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33018-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33018-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33019-bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33019-bug_657.cpp
index 3b5bb42a..3b5bb42a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33019-bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33019-bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33020-bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33020-bug_662.cpp
index 48b612ae..48b612ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33020-bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33020-bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33021-bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33021-bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33021-bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33021-bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33022-bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33022-bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33022-bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33022-bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33023-bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33023-bug_651.cpp
index f0236016..f0236016 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33023-bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33023-bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33024-bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33024-bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33024-bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33024-bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33025-bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33025-bug_654.cpp
index 497e3372..497e3372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33025-bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33025-bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33026-bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33026-bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33026-bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33026-bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33027-bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33027-bug_664.cpp
index 6fa5beea..6fa5beea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33027-bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33027-bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33028-braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33028-braces_empty.cpp
index 8e46ab7c..8e46ab7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33028-braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33028-braces_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33029-cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33029-cast.cpp
index 179c98c8..179c98c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33029-cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33029-cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33030-Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33030-Q_FOREVER.cpp
index 5dad4fa9..5dad4fa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33030-Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33030-Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33031-bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33031-bug_612.cpp
index 4388ac75..4388ac75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33031-bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33031-bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33032-bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33032-bug_670.cpp
index 0ede02f2..0ede02f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33032-bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33032-bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33033-bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33033-bug_670.h
index cc6d46e3..cc6d46e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33033-bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33033-bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33034-bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33034-bug_671.h
index 5ef3b5d9..5ef3b5d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33034-bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33034-bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33035-patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33035-patch_32.cpp
index 8b414f00..8b414f00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33035-patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33035-patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33036-bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33036-bug_663.cpp
index 7583d548..7583d548 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33036-bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33036-bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33037-func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33037-func_class.cpp
index ea271c11..ea271c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33037-func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33037-func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33038-func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33038-func_class.h
index 8b3ca218..8b3ca218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33038-func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33038-func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
index 707c1c38..707c1c38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33040-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33040-bug_i_411.cpp
index 5a3f09aa..5a3f09aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33040-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33040-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33041-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33041-bug_i_411.cpp
index 4e89d68d..4e89d68d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33041-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33041-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33042-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33042-bug_i_411.cpp
index 574f12ba..574f12ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33042-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33042-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33043-bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33043-bug_i_478.cpp
index 0f96e53c..0f96e53c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33043-bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33043-bug_i_478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33044-bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33044-bug_i_481.cpp
index e8470648..e8470648 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33044-bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33044-bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33045-bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33045-bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33045-bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33045-bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33046-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33046-bug_i_409.cpp
index 6946a562..6946a562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33046-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33046-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33047-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33047-bug_i_409.cpp
index 7bfdfd83..7bfdfd83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33047-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33047-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33048-bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33048-bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33048-bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33048-bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33049-pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33049-pp-pragma.cpp
index 2c013b08..2c013b08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33049-pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33049-pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33050-issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33050-issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33050-issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33050-issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33051-bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33051-bug_i_503.cpp
index 31ca41a8..31ca41a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33051-bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33051-bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33052-bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33052-bug_i_512.cpp
index 9b93cdf2..9b93cdf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33052-bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33052-bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33053-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33053-for_auto.cpp
index 073556c9..073556c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33053-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33053-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33054-bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33054-bug_i_825.cpp
index 242c4811..242c4811 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33054-bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33054-bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33056-bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33056-bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33056-bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33056-bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33057-bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33057-bug_1349.cpp
index fcc2e567..fcc2e567 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33057-bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33057-bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33058-stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33058-stdcall.cpp
index a2353599..a2353599 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33058-stdcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33058-stdcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33060-if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33060-if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33060-if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33060-if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33061-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33061-if_chain_braces.cpp
index b544f2bf..b544f2bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33061-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33061-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33062-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33062-if_chain_braces.cpp
index 1973042c..1973042c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33062-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33062-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33063-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33063-if_chain_braces.cpp
index 7a66eeec..7a66eeec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33063-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33063-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33064-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33064-if_chain_braces.cpp
index 2781fb26..2781fb26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33064-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33064-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33069-Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33069-Issue_2195.cpp
index fe3ec459..fe3ec459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33069-Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33069-Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33070-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33070-multi_line.cpp
index dcea4c00..dcea4c00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33070-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33070-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33071-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33071-multi_line.cpp
index 0f8503fc..0f8503fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33071-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33071-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33072-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33072-multi_line.cpp
index add93503..add93503 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33072-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33072-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33073-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33073-multi_line.cpp
index c0016ff6..c0016ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33073-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33073-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33074-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33074-multi_line.cpp
index c8f32960..c8f32960 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33074-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33074-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33075-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33075-multi_line.cpp
index 66963f4e..66963f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33075-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33075-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33076-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33076-multi_line.cpp
index 9d105267..9d105267 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33076-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33076-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33077-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33077-multi_line.cpp
index d7cbafc8..d7cbafc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33077-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33077-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33078-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33078-multi_line.cpp
index 01fe4d10..01fe4d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33078-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33078-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33079-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33079-multi_line.cpp
index 6a6490ab..6a6490ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33079-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33079-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33080-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33080-multi_line.cpp
index 8f44ce91..8f44ce91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33080-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33080-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33081-bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33081-bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33081-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33081-namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33081-namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33082-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33082-namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33082-namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33082-namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33083-bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33083-bug_i_359.cpp
index 8081c1f9..8081c1f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33083-bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33083-bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33084-op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33084-op_sym_empty.cpp
index 3557e513..3557e513 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33084-op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33084-op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33085-bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33085-bug_i_323.cpp
index 6f622f6e..6f622f6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33085-bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33085-bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33086-bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33086-bug_i_568.cpp
index 2e1a00d7..2e1a00d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33086-bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33086-bug_i_568.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33087-bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33087-bug_i_596.cpp
index db3644a2..db3644a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33087-bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33087-bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33088-bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33088-bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33088-bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33088-bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33089-bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33089-bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33089-bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33089-bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33090-gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33090-gh555.cpp
index 32147190..32147190 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33090-gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33090-gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33091-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
index 7311c71e..7311c71e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33092-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
index 94b20d2e..94b20d2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33093-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-bug_i_322.cpp
index 773f909e..773f909e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33093-bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33093-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-sp_angle_paren.cpp
index 7ed4f34e..7ed4f34e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33093-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33093-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33094-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33094-sp_angle_paren.cpp
index c20305c3..c20305c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33094-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33094-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33095-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33095-bug_i_322.cpp
index 3904ec27..3904ec27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33095-bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33095-bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33096-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
index df3d90ab..df3d90ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33097-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33097-enum_comma.h
index bb93f4a9..bb93f4a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33097-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33097-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33098-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33098-enum_comma.h
index 3ec29719..3ec29719 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33098-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33098-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33099-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33099-enum_comma.h
index 01a89059..01a89059 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33099-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33099-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33100-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33100-enum_comma.h
index 903a6849..903a6849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33100-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33100-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33101-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33101-enum_comma.h
index 53c1a99e..53c1a99e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33101-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33101-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33102-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33102-enum_comma.h
index 6c11f2b3..6c11f2b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33102-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33102-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33103-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33103-bug_858.cpp
index 1085f7db..1085f7db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33103-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33103-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33104-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33104-bug_858.cpp
index c5ac560e..c5ac560e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33104-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33104-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33105-bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33105-bug_1001.cpp
index d6104cd5..d6104cd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33105-bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33105-bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33106-pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33106-pos_bool_in_template.h
index f5fdb04e..f5fdb04e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33106-pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33106-pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33107-Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33107-Issue_2688.cpp
new file mode 100644
index 00000000..ac97ff3a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33107-Issue_2688.cpp
@@ -0,0 +1,7 @@
+{
+  std::vector<Object> someVector = {
+    flag && (hasFeedback != nil)
+  ? objectA
+  : objectB,
+  };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33108-Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33108-Issue_2045.cpp
index a1670ffc..a1670ffc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33108-Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33108-Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33110-enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33110-enum.cpp
index 3872557e..3872557e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33110-enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33110-enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33120-Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33120-Issue_2149.cpp
index 1266bd7b..1266bd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33120-Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33120-Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33150-bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33150-bug_i_753.cpp
index 9aa764a4..9aa764a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33150-bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33150-bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33151-bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33151-bug_i_752.cpp
index da8fe9f5..da8fe9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33151-bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33151-bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33152-bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33152-bug_1004.cpp
index f072a583..f072a583 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33152-bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33152-bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33160-bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33160-bug_1112.cpp
index da95fcb6..da95fcb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33160-bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33160-bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33161-byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33161-byref-3.cpp
index 8c51bf46..8c51bf46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33161-byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33161-byref-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33180-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33180-pp_multi_comment.cpp
index bfe1e1d1..bfe1e1d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33180-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33180-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33181-Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33181-Issue_2759.cpp
new file mode 100644
index 00000000..cbe9c4a5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33181-Issue_2759.cpp
@@ -0,0 +1,6 @@
+Foo::Foo(int a,
+         int b)
+    : a_(a),  // the comment should stay here
+      b_(b)
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33182-Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33182-Issue_2794.cpp
new file mode 100644
index 00000000..16de515b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33182-Issue_2794.cpp
@@ -0,0 +1,24 @@
+int
+main()
+{
+        int i, j, k, l, m, q;
+
+        i = rand();
+        k = rand();
+        l = rand();
+        m = rand();
+        j = rand();
+        q = i * j + (2 * l) /m - ( 100 * k ) + k * k - i * i + 3000 * j + 1000; /*
+                                                                                 * this
+                                                                                 * is
+                                                                                 * a
+                                                                                 * very
+                                                                                 * long
+                                                                                 * trailing
+                                                                                 * c
+                                                                                 * comment
+                                                                                 */
+
+// the trailing * */ above should be */
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33200-first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33200-first_len_minimum.cpp
index c33d9e03..c33d9e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33200-first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33200-first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
index 3b1bea1c..3b1bea1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33202-initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
index a3bc4a2a..a3bc4a2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33203-Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-Issue_2574.cpp
index bd88347d..bd88347d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33203-Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33203-bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-bug_1288.cpp
index 94444cf9..94444cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33203-bug_1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33203-bug_1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33204-Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33204-Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33204-Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33204-Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33210-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33210-templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33210-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33210-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33211-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33211-pp_multi_comment.cpp
index 5690e3a6..5690e3a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33211-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33211-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33212-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33212-pp-define-indent.cpp
index 78dc4c98..78dc4c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33212-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33212-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33213-disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33213-disable_macro.cpp
index 7e64f416..7e64f416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/33213-disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33213-disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33214-Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33214-Issue_2742.cpp
new file mode 100644
index 00000000..66d12fec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33214-Issue_2742.cpp
@@ -0,0 +1,7 @@
+
+#define FOO \
+\
+	int    my_type; \
+	int    a; \
+	float  b; \
+	double c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33215-Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33215-Issue_3055.cpp
new file mode 100644
index 00000000..d23a0d56
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33215-Issue_3055.cpp
@@ -0,0 +1,12 @@
+#ifndef ABC
+#define ABC
+
+#ifdef XYZ1
+extern "C" {
+#endif
+
+#ifdef XYZ2
+}
+#endif
+
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33216-Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33216-Issue_3055-a.cpp
new file mode 100644
index 00000000..21a5c35c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33216-Issue_3055-a.cpp
@@ -0,0 +1,13 @@
+#ifndef ABC
+#  define ABC
+
+#  ifdef XYZ1
+extern "C" {
+#  endif
+
+#  ifdef XYZ2
+}
+#  endif
+
+#endif
+int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33217-Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33217-Issue_3113.cpp
new file mode 100644
index 00000000..63090f4a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/33217-Issue_3113.cpp
@@ -0,0 +1 @@
+#define CONTINUE_IF(expr) { if ((expr)) continue; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34001-nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34001-nl_before_after.h
index 02d84f4a..8cdc7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34001-nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34001-nl_before_after.h
@@ -69,6 +69,10 @@ class I
 {
 };
 
+using namespace F;
+
+namespace M
+{
 void bar4();
 
 /* multiline test comment
@@ -77,11 +81,9 @@ template<typename ... Args>
 // test comment between template specification and associated class
 class H
 {
-
     // nested class
     template<typename ...>
     friend class I;
-
     friend class J;
 
     // nested class K
@@ -95,3 +97,22 @@ class H
     };
 
 };
+
+}
+
+class AA;
+class AB;
+
+namespace BA
+{
+class BB;
+class BC;
+
+class BD
+{
+public:
+    friend class BE;
+    BD();
+};
+
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34002-bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34002-bug_i_793.cpp
index b6b6a7ab..b6b6a7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34002-bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34002-bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
index cd1083ee..cd1083ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
index c2f8dc36..c2f8dc36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
index 738f3bf6..738f3bf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34006-bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34006-bug_i_575.cpp
index 4c25fb75..4c25fb75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34006-bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34006-bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34007-bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34007-bug_i_928.cpp
index 78b214bd..78b214bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34007-bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34007-bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34100-bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34100-bug_i_525.cpp
index b810afe0..b810afe0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34100-bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34100-bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34101-bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34101-bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34101-bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34101-bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34105-bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34105-bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34105-bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34105-bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34108-bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34108-bug_i_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34108-bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34108-bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34112-bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34112-bug_i_889.cpp
index 5b803a0e..5b803a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34112-bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34112-bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34113-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34113-bug_902.cpp
index ada480c0..ada480c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34113-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34113-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34114-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34114-bug_902.cpp
index af6bdb44..af6bdb44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34114-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34114-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
index ff76cb2b..ff76cb2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34116-issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34116-issue_2000.cpp
index f4f2c2bf..f4f2c2bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34116-issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34116-issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34117-extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34117-extern_func.cpp
index 4de29e3c..4de29e3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34117-extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34117-extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34118-Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34118-Issue_2163.cpp
index afd04eb0..afd04eb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34118-Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34118-Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34120-bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34120-bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34120-bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34120-bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34121-bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34121-bug_1717.cpp
index 4116871f..4116871f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34121-bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34121-bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34122-Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34122-Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34122-Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34122-Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34123-Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34130-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34130-bug_i_1000.cpp
index 6e1e7a0e..6e1e7a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34130-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34130-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34131-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34131-bug_i_1000.cpp
index 149353e7..149353e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34131-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34131-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34132-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34132-new_op.cpp
index 15386247..15386247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34132-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34132-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34133-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34133-new_op.cpp
index ce690c94..ce690c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34133-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34133-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34134-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34134-new_op.cpp
index 67dfa187..67dfa187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34134-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34134-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34135-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34135-new_op.cpp
index 044cd859..044cd859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34135-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34135-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
index 0a6635d0..0a6635d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34140-bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34140-bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34140-bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34140-bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34141-bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34141-bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34141-bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34141-bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34142-I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34142-I1112-1.cpp
index df27d1d6..df27d1d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34142-I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34142-I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34143-I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34143-I1112-2.cpp
index 28a4489d..28a4489d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34143-I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34143-I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34144-I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34144-I1112-3.cpp
index c95a6c40..c95a6c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34144-I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34144-I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34145-i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34145-i683.cpp
index 255c6336..255c6336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34145-i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34145-i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34146-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34146-bug_1002.cpp
index 0d72c80a..0d72c80a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34146-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34146-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34147-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34147-bug_1002.cpp
index 02b85396..02b85396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34147-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34147-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34148-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34148-bug_1139.cpp
index d6d8a484..d6d8a484 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34148-bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34148-bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34149-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34149-bug_1139.cpp
index dd0a10dc..dd0a10dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34149-bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34149-bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34150-bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34150-bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34150-bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34150-bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34151-bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34151-bug_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34151-bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34151-bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34152-bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34152-bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34152-bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34152-bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34153-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
index 356a7713..356a7713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34154-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
index adc09173..adc09173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34155-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
index 7d62eafb..7d62eafb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34156-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
index 6519b4b1..6519b4b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34157-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
index 6751c0fa..6751c0fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34158-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
index d5dcfdeb..d5dcfdeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34159-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
index 0b9bf31c..0b9bf31c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34160-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
index 01c89132..01c89132 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34161-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34162-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
index 2d5dc62c..2d5dc62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34163-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
index 9be7507a..9be7507a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34164-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
index 68565614..68565614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34165-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
index 92fc0b0b..92fc0b0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34166-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
index d7dfa908..d7dfa908 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34167-nl_func_call_args_multi_line_ignore_closures.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34167-nl_func_call_args_multi_line_ignore_closures.cpp
index 382669a7..4363833f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34167-nl_func_call_args_multi_line_ignore_closures.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34167-nl_func_call_args_multi_line_ignore_closures.cpp
@@ -51,7 +51,7 @@ methodCall(
 methodCall(arg1, arg2, arg3);
 
 methodCall(
-	arg1, [] {
+	arg1, []{
 	variant.action.send(Cmpnt);
 }, arg3
 	);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34168-Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34168-Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34168-Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34168-Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34169-init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34169-init-list-call.cpp
index 95449eb1..95449eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34169-init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34169-init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34170-i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34170-i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34170-i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34170-i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34171-i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34171-i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34171-i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34171-i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34172-i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34172-i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34172-i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34172-i1165.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34173-i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34173-i1464.cpp
index e4005841..e4005841 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34173-i1464.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34173-i1464.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34174-i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34174-i1466.cpp
index 912488b3..912488b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34174-i1466.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34174-i1466.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34175-i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34175-i1509.cpp
index 419807fd..419807fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34175-i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34175-i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
index b9a75cf6..b9a75cf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34177-sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
new file mode 100644
index 00000000..580e9bae
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
@@ -0,0 +1,11 @@
+BEGIN_MESSAGE_MAP (CUSB2_camera_developementDlg, CDialog)
+   ON_COMMAND (IDC_ESCAPE, On_Escape)
+   ON_COMMAND (IDC_8_BIT, On_8_Bit)
+   ON_COMMAND (IDC_14_BIT, On_14_Bit)
+   ON_COMMAND (IDC_ACQUIRE, On_Acquire)
+   ON_COMMAND (IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages)
+   ON_COMMAND (IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages)
+   ON_WM_PAINT ()
+   ON_WM_QUERYDRAGICON ()
+   ON_WM_CTLCOLOR ()
+END_MESSAGE_MAP ()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34180-bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34180-bug_1402.cpp
new file mode 100644
index 00000000..09714c41
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34180-bug_1402.cpp
@@ -0,0 +1,12 @@
+namespace Constants
+{
+double PI = 3.14;
+}
+int factor = 41;
+double result = Constants::PI * factor;
+
+return Constants::PI * factor;
+
+void func(int value) {
+	return SomeClass(value, Constants::PI * value);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34190-bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34190-bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34190-bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34190-bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34191-comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34191-comment-align-multiline.cpp
index db501481..db501481 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34191-comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34191-comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34192-i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34192-i1207.cpp
index e02da8c9..e02da8c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34192-i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34192-i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34193-i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34193-i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34193-i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34193-i1218.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34194-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34194-sp_arith_additive.cpp
index 5ecb2ec8..5ecb2ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34194-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34194-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34195-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34195-sp_arith_additive.cpp
index f419a3ed..f419a3ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34195-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34195-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34196-Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34196-Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34196-Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34196-Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34197-bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34197-bug_1161.cpp
index 34740f5a..34740f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34197-bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34197-bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34198-bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34198-bug_1249.cpp
index 65637efe..65637efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34198-bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34198-bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34199-not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34199-not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34199-not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34199-not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34200-i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34200-i1536.cpp
index 659ee5b3..0eb7fc69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34200-i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34200-i1536.cpp
@@ -1,3 +1,4 @@
+// FuncA
 void FuncA(void)
 {
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34201-i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34201-i1565.cpp
index d0bef508..d0bef508 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34201-i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34201-i1565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34202-i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34202-i1617.cpp
index 98ede13b..98ede13b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34202-i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34202-i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34203-i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34203-i1516.cpp
index d415b945..d415b945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34203-i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34203-i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
index e8790dbd..e8790dbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34205-bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34205-bug_1395.cpp
index 16e2fbba..16e2fbba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34205-bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34205-bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34206-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34206-for_loop_head.cpp
index 6cea550d..6cea550d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34206-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34206-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34207-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34207-for_loop_head.cpp
index 2aa9bdc0..2aa9bdc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34207-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34207-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34208-conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34208-conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34208-conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34208-conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34209-lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
index e37674a1..e37674a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34210-override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34210-override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34210-override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34210-override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34211-anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34211-anonymous_enum.cpp
index ef237a6e..ef237a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34211-anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34211-anonymous_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34250-bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34250-bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34250-bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34250-bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34251-bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34251-bug_1649.cpp
index 4b352c79..4b352c79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34251-bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34251-bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34252-issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34252-issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34252-issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34252-issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34253-friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34253-friends.cpp
index 58fd649a..58fd649a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34253-friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34253-friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34254-issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34254-issue_1985.cpp
index ef9fc90a..ef9fc90a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34254-issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34254-issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
new file mode 100644
index 00000000..7005d86c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
@@ -0,0 +1,15 @@
+class A

+{

+    void

+    func1()

+    {

+        // comment

+    }

+

+    void

+    func2()

+    {

+        auto result = 1 + 2 +

+                      3 + 4;

+    }

+};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34256-Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34256-Issue_2836.cpp
new file mode 100644
index 00000000..4d2a648f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34256-Issue_2836.cpp
@@ -0,0 +1,4 @@
+module x;
+static if (1) {{
+		       int x;
+	       }}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34280-UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34280-UNI-29935.cpp
new file mode 100644
index 00000000..8b13bd9c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34280-UNI-29935.cpp
@@ -0,0 +1,6 @@
+void Foo1(BarType& x, void BarFunc());
+
+void Bar()
+{
+    void BarFunc2(BarType& x);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
index 272865bc..272865bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
index 395906c7..395906c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
index cc0ac847..cc0ac847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
index c47119ab..c47119ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
index 7d3ae3a2..7d3ae3a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
index 92204813..92204813 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34296-i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34296-i1768.cpp
index 94327d9c..94327d9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34296-i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34296-i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34297-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34297-align-assign-mixed.cpp
index d8082600..d8082600 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34297-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34297-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34298-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34298-align-assign-mixed.cpp
index 4f8dadde..4f8dadde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34298-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34298-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34299-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34299-align-assign-mixed.cpp
index ddae789b..ddae789b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34299-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34299-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34300-bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34300-bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34300-bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34300-bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
index 05aaf7c8..05aaf7c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
index 8a35c775..8a35c775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
index e498a669..e498a669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
index 078e070a..078e070a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34305-issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34305-issue_2124-1.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34305-issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34305-issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34306-issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34306-issue_2124-2.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34306-issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34306-issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34307-2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34307-2203.cpp
index 70a1f31a..70a1f31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34307-2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34307-2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34308-enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34309-issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34309-issue_2209-1.cpp
index 82ff67c6..82ff67c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34309-issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34309-issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34310-issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34310-issue_2209-2.cpp
index 26c579d3..26c579d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34310-issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34310-issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34311-Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34311-Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34311-Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34311-Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34312-Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34312-Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34312-Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34312-Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34313-Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34313-Issue_2437.cpp
index 77a273ef..77a273ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34313-Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34313-Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34314-Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34314-Issue_2604.cpp
index eb87fc8a..eb87fc8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34314-Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34314-Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
index c4f1a119..c4f1a119 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
index 1bbde49b..1bbde49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
index e0d3488a..e0d3488a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34318-align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
index 1c003058..1c003058 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
index 8a9df8b4..8a9df8b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
index 432a9e3e..432a9e3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34321-bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34321-bug_2285.cpp
index a456e9be..a456e9be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34321-bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34321-bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34322-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34322-issue_2623.cpp
index a9566447..a9566447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34322-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34322-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34323-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34323-issue_2623.cpp
index 72fd90e8..72fd90e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34323-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34323-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34324-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34324-issue_2623.cpp
index 61961fa1..61961fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/34324-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34324-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34325-Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34325-Issue_3025.cpp
new file mode 100644
index 00000000..9e64526e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34325-Issue_3025.cpp
@@ -0,0 +1,2 @@
+int a;// Рука
+int d;/* Рука */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34326-Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34326-Issue_3040.cpp
new file mode 100644
index 00000000..f9e69333
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34326-Issue_3040.cpp
@@ -0,0 +1,70 @@
+int main()
+{
+  switch (opcode)
+  {
+    case 1:
+    {
+      return Number(localeCompare(s, a0.toString(exec)));
+    }
+
+#ifndef A
+    case 2:
+    {
+      result = String("<big>" + s + "</big>");
+      break;
+    }
+#endif
+  }
+
+  switch (ev->command)
+  {
+    case (3):
+    {
+      ev->note = *ptrdata; ptrdata++; currentpos++;
+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
+      if (ev->vel==0)
+	note[ev->chn][ev->note]=FALSE;
+      else
+	note[ev->chn][ev->note]=TRUE;
+
+#ifdef B
+      if (ev->chn==6) {
+	if (ev->vel==0) printfdebug("Note Onf\n");
+	else printfdebug("Note On\n");
+      };
+#endif
+      break;
+    }
+
+    case (4):
+    {
+#ifdef C
+      if (ev->chn==6) printfdebug("Note Off\n");
+#endif
+      ev->note = *ptrdata; ptrdata++; currentpos++;
+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
+      note[ev->chn][ev->note]=FALSE;
+
+      break;
+    }
+
+    case (5):
+    {
+#ifdef D
+      if (ev->chn==6) printfdebug ("Key press\n");
+#endif
+      ev->note = *ptrdata; ptrdata++; currentpos++;
+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
+      break;
+    }
+
+#ifndef E
+    case 6:
+    {
+      result = String("<big>" + s + "</big>");
+      break;
+    }
+#endif
+  }
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34327-Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34327-Issue_3044.cpp
new file mode 100644
index 00000000..799fd0a1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34327-Issue_3044.cpp
@@ -0,0 +1,61 @@
+int main()
+{
+	int af;
+	int A;
+	int B;
+	switch (af)
+	{
+		case 1:
+		{
+			B = 2;
+		}
+
+		case 2:
+		{
+			return 1;
+		}
+
+		case 3:
+		{
+			A = 1;
+			break;
+		}
+
+#ifdef ALL_THE_CASE
+		case 4:
+		{
+			return 2;
+		}
+
+#endif
+#ifdef ALL_THE_CASE
+		case 5:
+		{
+			B = 2;
+		}
+
+#endif
+		case (6):
+		{
+			B=13;
+#ifdef PART_OF_THE_CASE_UNDER
+			A=1;
+#endif
+			break;
+		}
+
+		case (7):
+		{
+#ifdef PART_OF_THE_CASE_ABOVE
+			A=5;
+#endif
+			B=7;
+			break;
+		}
+
+		default:
+		{
+			B= 50;
+		}
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34328-Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34328-Issue_3048.cpp
new file mode 100644
index 00000000..fb6b0d38
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34328-Issue_3048.cpp
@@ -0,0 +1,58 @@
+int main()
+{
+	int sa_family;
+	int d;
+	int scopeid;
+	switch (sa_family)
+	{
+		case 1:
+		{
+#ifdef AF_INET6
+			if (d == 1)
+			{
+				scopeid = 1;
+			}
+			else
+			{
+				scopeid = 2;
+			}
+			return 5;
+#else
+			return 6;
+#endif
+		}
+
+		case 2:
+		{
+#ifdef AF_INET6
+			TQString scopeid("%");
+			if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
+			{
+				scopeid += TQString::number(d->addr.in6->sin6_scope_id);
+			}
+			else
+			{
+				scopeid.truncate(0);
+			}
+			return d->ref.ipAddress().toString() + scopeid;
+#endif
+		}
+
+		case 3:
+		{
+#ifdef AF_INET6
+			TQString scopeid("%");
+			if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
+			{
+				scopeid += TQString::number(d->addr.in6->sin6_scope_id);
+			}
+			else
+			{
+				scopeid.truncate(0);
+			}
+			return d->ref.ipAddress().toString() + scopeid;
+#endif
+		}
+	}
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
new file mode 100644
index 00000000..d46f2655
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
@@ -0,0 +1,14 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
new file mode 100644
index 00000000..d46f2655
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
@@ -0,0 +1,14 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
new file mode 100644
index 00000000..d46f2655
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
@@ -0,0 +1,14 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
new file mode 100644
index 00000000..ef73253e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
@@ -0,0 +1,14 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
new file mode 100644
index 00000000..ef73253e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
@@ -0,0 +1,14 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
new file mode 100644
index 00000000..ef73253e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
@@ -0,0 +1,14 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
new file mode 100644
index 00000000..c228ce46
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
@@ -0,0 +1,15 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
new file mode 100644
index 00000000..c228ce46
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
@@ -0,0 +1,15 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
new file mode 100644
index 00000000..c228ce46
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
@@ -0,0 +1,15 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
new file mode 100644
index 00000000..7188f0d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
@@ -0,0 +1,16 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
+
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
new file mode 100644
index 00000000..7188f0d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
@@ -0,0 +1,16 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
+
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
new file mode 100644
index 00000000..7188f0d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
@@ -0,0 +1,16 @@
+DCOPClient::DCOPClient()
+{
+    TQObject::connect(
+        &d->postMessageTimer, TQT_SIGNAL(
+            timeout()), this,
+        TQT_SLOT(
+            processPostedMessagesInternal()));
+    TQObject::connect(
+        &d->eventLoopTimer, TQT_SIGNAL(
+            timeout()), this, TQT_SLOT(
+            eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
+
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
new file mode 100644
index 00000000..0e475aa4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
@@ -0,0 +1,7 @@
+#include <string>
+
+extern char* externBufferWithAVeryLongName;
+extern unsigned int externBufferSizeWithLongName;
+
+std::string foo{ externBufferWithAVeryLongName
+               , externBufferSizeWithLongName };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
new file mode 100644
index 00000000..59b5b996
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
@@ -0,0 +1,10 @@
+#include <string>
+
+extern char* externBufferWithAVeryLongName;
+extern unsigned int externBufferSizeWithLongName;
+
+std::string foo()
+{
+    return std::string{ externBufferWithAVeryLongName
+                      , externBufferSizeWithLongName };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/39000-UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39000-UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/39000-UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39000-UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/39001-GH-2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39001-GH-2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/39001-GH-2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/39001-GH-2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60001-UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60001-UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60001-UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60001-UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60002-UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60002-UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60002-UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60002-UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60003-UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60003-UNI-1288.cpp
index aece270a..aece270a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60003-UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60003-UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60006-UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60006-UNI-2049.cpp
index 4609fbea..4609fbea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60006-UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60006-UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60017-UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60017-UNI-2683.cpp
index 734e3999..734e3999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60017-UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60017-UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60022-UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60022-UNI-18439.cpp
index 8d467c67..8d467c67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60022-UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60022-UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60025-UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60025-UNI-19894.cpp
index 2d7e481e..2d7e481e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60025-UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60025-UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60027-UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60027-UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60027-UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60027-UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60028-UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60028-UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60028-UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60028-UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60029-UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60029-UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60029-UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60029-UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60030-UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60030-UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60030-UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60030-UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60031-UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60031-UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60031-UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60031-UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60032-UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60032-UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60032-UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60032-UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60036-UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60036-UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60036-UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60036-UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60038-UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60038-UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60038-UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60038-UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60039-UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60039-UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60039-UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60039-UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60042-UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60042-UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60042-UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60042-UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60043-i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60043-i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60043-i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60043-i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60044-i2116.cpp
index af664cd9..af664cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60044-i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60044-i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
index 364b2a6b..364b2a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60047-align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60047-align_default_after_override.cpp
index 43db090f..43db090f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60047-align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60047-align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60048-bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60048-bug_2322.cpp
index 50454903..50454903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60048-bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60048-bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60049-bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60049-bug_2402.cpp
index e483fdc9..e483fdc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60049-bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60049-bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp
index a344480b..a344480b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60051-bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60051-bug_2371.cpp
index f17cec62..f17cec62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60051-bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60051-bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60052-bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60052-bug_2433_1.cpp
index d011d5a1..d011d5a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60052-bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60052-bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60053-bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60053-bug_2433_2.cpp
index 600efc82..600efc82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60053-bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60053-bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
index ed92e698..ed92e698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60055-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60055-issue_3116.cpp
new file mode 100644
index 00000000..44ec3a5f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60055-issue_3116.cpp
@@ -0,0 +1,233 @@
+// Singular with various newline formats
+auto f = [] -> void {
+    return;
+};
+
+auto f = [] -> void {
+    return;
+}();
+
+auto f = [] -> void
+{
+    return;
+}();
+
+auto f =
+    [] -> void {
+        return;
+    };
+
+auto f =
+    [] -> void
+    {
+        return;
+    };
+
+auto f
+    = [] -> void {
+        int i = 0;
+        return;
+    };
+
+auto f
+    = []
+    {
+        int i = 0;
+        return;
+    };
+
+// Nested lambda
+auto f = [] {
+    auto g = [] {
+        auto h = [] {
+            return;
+        };
+        return;
+    };
+    return;
+};
+
+auto f = [] {
+    auto g = []
+    {
+        auto h = [] {
+            return;
+        };
+        return;
+    };
+    return;
+};
+
+auto f = []
+{
+    auto g = [] {
+        auto h = []
+        {
+            return;
+        };
+        return;
+    };
+    return;
+};
+
+// Nested lambda within functions
+Func(
+    [] {
+        return;
+    },
+    [] {
+        return;
+    }
+);
+
+Func([] {
+        return;
+    },
+    [] {
+        return;
+    }
+);
+
+Func([] {
+        return;
+    },
+    [] {
+        return;
+    }
+)();
+
+Func([] {
+        return;
+    },
+    [] {
+        return;
+    })();
+
+Func([] {
+        return;
+    },
+    [] {
+        return;
+    });
+
+A(
+    B([] (const std::string &s) -> bool {
+        s = "hello";
+        return true;
+    }), 1
+);
+
+A(
+    B(
+        [] (const std::string &s) -> bool {
+            s = "hello";
+            return true;
+        }
+    ), 1
+);
+
+// Inside scope
+{
+    std::thread([](const char *c) {
+        std::cout << c << std::endl;
+    }).detach();
+
+    std::thread(
+        [](const char *c) {
+            std::cout << c << std::endl;
+        }
+    ).detach();
+
+    auto f = [&](int a) {
+        return b;
+    };
+
+    auto f = [&](int a)
+    {
+        return b;
+    };
+}
+
+Func(std::count_if(v.begin(), v.end(), [&](const auto &a) {
+    return a == 3;
+}));
+
+Func(
+    std::count_if(v.begin(), v.end(), [&](const auto &a)
+    {
+        return a == 3;
+    }));
+
+Func(
+    std::count_if(v.begin(), v.end(), [&](const auto &a) {
+        return a == 3;
+    }));
+
+Func(
+    std::count_if(v.begin(), v.end(), [&](const auto &a) {
+        return a == 3;
+    })
+);
+
+// Test case from issue #3116
+const auto compare = [] (const auto i, const auto j)
+{
+    return i >= j;
+};
+
+std::sort(
+    vector.begin(),
+    vector.end(),
+    [] (const auto i, const auto j)
+    {
+        return i >= j;
+    }
+);
+
+// Test case from issue #3116
+if(isWidgetOfCurrentRow)
+{
+    it = std::find_if(
+        reloaded.begin(),
+        reloaded.end(),
+        [&rowGuid](const auto& device)
+        {
+            return (device.thingGUID == rowGuid && !device.isWidget);
+        }
+    );
+}
+else
+{
+    it = std::find_if(
+        reloaded.begin(),
+        reloaded.end(),
+        [&rowGuid](const auto& device)
+        {
+            return device.thingGUID == rowGuid;
+        }
+    );
+}
+
+// Test case from issue 1296 and some variants
+obj->Func([&](int a)
+{
+    return b;
+});
+
+obj->Func([] -> int
+{
+    return b;
+});
+
+obj->Func([]
+    {
+        return b;
+    }
+);
+
+obj->Func(
+    Func([]
+    {
+        return b;
+    })
+);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60056-issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60056-issue_3116-2.cpp
new file mode 100644
index 00000000..dded453c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/60056-issue_3116-2.cpp
@@ -0,0 +1,41 @@
+obj.AddObject(Object::UniqueName(), 10, [this] {
+    holder.Access([this](const auto &info) {
+        if (IsGood(info)) {
+            Add(info);
+        }
+    });
+});
+
+obj.AddObject(
+    Object::UniqueName(),
+    10,
+    [this] {
+        holder.Access([this](const auto &info) {
+            if (IsGood(info)) {
+                Add(info);
+            }
+        });
+    }
+);
+
+{
+    obj.AddObject(Object::UniqueName(), 10, [this] {
+        holder.Access([this](const auto &info) {
+            if (IsGood(info)) {
+                Add(info);
+            }
+        });
+    });
+
+    obj.AddObject(
+        Object::UniqueName(),
+        10,
+        [this] {
+            holder.Access([this](const auto &info) {
+                if (IsGood(info)) {
+                    Add(info);
+                }
+            });
+        }
+    );
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/align-330.cpp
index 0ba91720..0ba91720 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cpp/align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cpp/align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10000-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10000-simple.cs
index 36cedfa2..36cedfa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10000-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10000-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10001-getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10001-getset.cs
index 756170b6..756170b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10001-getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10001-getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10002-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10002-simple.cs
index f8344b26..f8344b26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10002-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10002-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10003-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10003-region.cs
index 2ada63e7..2ada63e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10003-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10003-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10010-var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10010-var-member.cs
index 0da0b9f5..0da0b9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10010-var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10010-var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10011-strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10011-strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10011-strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10011-strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10012-621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10012-621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10012-621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10012-621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10013-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-620_getset-brace.cs
index d4652c5f..d4652c5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10013-620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10013-625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-625_where-constraints.cs
index 123109b0..123109b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10013-625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10013-625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10015-misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10015-misc-failures.cs
index e7022083..e7022083 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10015-misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10015-misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10016-new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10016-new-constraint-paren-space.cs
index a337a447..a337a447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10016-new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10016-new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10018-delete-space-oc.mm
index 59496772..59496772 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10018-delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10018-delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10019-func-param-wrap-oc.mm
index 6e192eec..6e192eec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10019-func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10019-func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10020-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10020-region.cs
index b2f57ece..b2f57ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10020-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10020-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10021-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10021-region.cs
index 926e467d..926e467d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10021-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10021-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10022-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10022-region.cs
index 9628d4fd..9628d4fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10022-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10022-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10023-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10023-region.cs
index e21c467c..e21c467c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10023-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10023-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10027-oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10027-oneline_property.cs
index e4470be2..e4470be2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10027-oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10027-oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10028-ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10028-ifcolalign.cs
index 13df0440..13df0440 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10028-ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10028-ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10029-when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10029-when.cs
index 4480f618..4480f618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10029-when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10029-when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10030-sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10030-sort_using.cs
index 99e802c1..99e802c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10030-sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10030-sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10031-bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10031-bug_i_935.cs
index c45eb79d..c45eb79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10031-bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10031-bug_i_935.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10032-sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10032-sort_using_categ.cs
index ec997fc9..ec997fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10032-sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10032-sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10033-objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10033-objc.mm
index 07ede276..07ede276 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10033-objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10033-objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10034-asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10034-asm.h.mm
index 84a5efa8..84a5efa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10034-asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10034-asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10035-definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10035-definesalign.h.mm
index 9ad29954..9ad29954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10035-definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10035-definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10036-inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10036-inttypes.h.mm
index 4ac13417..4ac13417 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10036-inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10036-inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10039-615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10039-615_nested-usings.cs
index d46108bd..d46108bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10039-615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10039-615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10040-tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10040-tcf.cs
index 009f269e..009f269e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10040-tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10040-tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10041-gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10041-gs.cs
index ba9f873e..ba9f873e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10041-gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10041-gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10042-exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10042-exception-filters.cs
index d638d9a8..d638d9a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10042-exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10042-exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10044-ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10044-ifcomment.cs
index 2c3ab0fc..2c3ab0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10044-ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10044-ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10045-UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10045-UNI-1288.cs
index 03d60f5b..03d60f5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10045-UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10045-UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10046-UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10046-UNI-1333.mm
index de887ad0..de887ad0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10046-UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10046-UNI-1333.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10050-generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10050-generics.cs
index 74e49ecd..74e49ecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10050-generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10050-generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10051-UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10051-UNI-1338.cs
index 3f3d9d06..3f3d9d06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10051-UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10051-UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10055-UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10055-UNI-1345.cs
index 13f61127..13f61127 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10055-UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10055-UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10060-unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10060-unsafe.cs
index fdfdd67b..fdfdd67b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10060-unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10060-unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10065-UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10065-UNI-1975.cs
index 1d2f2659..1d2f2659 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10065-UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10065-UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10066-UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10066-UNI-1977.cs
index 94b929c4..94b929c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10066-UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10066-UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10067-UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10067-UNI-1978.cs
index 5f55cb2f..5f55cb2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10067-UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10067-UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10070-utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10070-utf16le.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10070-utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10070-utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10071-utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10071-utf16be.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10071-utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10071-utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10072-utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10072-utf16le_no_bom.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10072-utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10072-utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10073-utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10073-utf16be_no_bom.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10073-utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10073-utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10074-UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10074-UNI-2020.cs
index 854a3655..854a3655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10074-UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10074-UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10075-UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10075-UNI-2021.cs
index b0ec0414..b0ec0414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10075-UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10075-UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10076-UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10076-UNI-1343.cs
index 076e338d..076e338d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10076-UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10076-UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10077-UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10077-UNI-1919.cs
index cc8e8420..cc8e8420 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10077-UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10077-UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10078-UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10078-UNI-3484.cs
index d7e4f26a..d7e4f26a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10078-UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10078-UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10080-property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10080-property.cs
index 98d3c21c..98d3c21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10080-property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10080-property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10090-string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10090-string_multi.cs
index 7d006dce..7d006dce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10090-string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10090-string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10100-bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10100-bug_600.cs
index 54c24643..54c24643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10100-bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10100-bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10101-sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10101-sf607.cs
index 3207e6c5..3207e6c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10101-sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10101-sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10102-pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10102-pp-ignore.mm
index f26232c9..f26232c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10102-pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10102-pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10103-UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10103-UNI-2506.cs
index 8cd07962..8cd07962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10103-UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10103-UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10104-UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10104-UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10104-UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10104-UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10110-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10110-mdarray_space.cs
index 8c328f5e..8c328f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10110-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10110-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10111-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10111-mdarray_space.cs
index 56aa58ce..56aa58ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10111-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10111-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10112-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10112-mdarray_space.cs
index ab877b8e..ab877b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10112-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10112-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10119-preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10119-preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10119-preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10119-preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10120-cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10120-cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10120-cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10120-cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10130-sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10130-sp_between_new_paren.cs
index fd706ffa..fd706ffa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10130-sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10130-sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10140-remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10140-remove_semi.cs
index 3ee1926e..3ee1926e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10140-remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10140-remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10150-operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10150-operator-null-conditional.cs
index 61ac6d74..61ac6d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10150-operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10150-operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10160-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10160-delegate.cs
index 6296ad80..6296ad80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10160-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10160-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10161-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10161-delegate.cs
index 152fba2b..152fba2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10161-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10161-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10200-logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10200-logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10200-logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10200-logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10300-1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10300-1822.cs
index 92b5fd5b..92b5fd5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10300-1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10300-1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10628-sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10628-sf628.cs
index 54d3c52c..54d3c52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/10628-sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/10628-sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11011-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11011-620_getset-brace.cs
index d4652c5f..d4652c5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11011-620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11011-620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11030-argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11030-argtypes.mm
index 1afeb694..1afeb694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11030-argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11030-argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11031-casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11031-casting.mm
index c73d6ef8..c73d6ef8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11031-casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11031-casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11032-newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11032-newlines.mm
index 49a15913..49a15913 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11032-newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11032-newlines.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11072-UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11072-UNI-2007.cs
index 29e53f26..29e53f26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11072-UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11072-UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11073-UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11073-UNI-2008.cs
index a4de3475..a4de3475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/11073-UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/11073-UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12001-bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12001-bug_620.cs
index 56e9b8bc..56e9b8bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12001-bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12001-bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12002-nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12002-nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12002-nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12002-nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
index 3dab10f6..3dab10f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12004-verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12004-verbatim_strings.cs
index 73fa1bf0..73fa1bf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12004-verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12004-verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12005-bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12005-bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12005-bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12005-bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12101-bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12101-bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12101-bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12101-bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
index e6e0eede..e6e0eede 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
index 8ecd4051..8ecd4051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12104-bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12104-bug_1637.cs
index 9ffe19e7..9ffe19e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12104-bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12104-bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12105-bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12105-bug_1650.cs
index 869a9d0f..869a9d0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12105-bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12105-bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12106-UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12106-UNI-40685.cs
index 9b70920e..9b70920e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12106-UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12106-UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12108-Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12108-Issue_2705.cs
index 08619bb1..08619bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/12108-Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/12108-Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/19000-UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/19000-UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/19000-UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/19000-UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/20010-UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20010-UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/20010-UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20010-UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/20011-bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20011-bug_1620.cs
index 3b837292..3b837292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/20011-bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/20011-bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60004-UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60004-UNI-2684.cs
index ff0b31f1..ff0b31f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60004-UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60004-UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60005-UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60005-UNI-2685.cs
index ec671dd4..ec671dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60005-UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60005-UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60007-UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60007-UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60007-UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60007-UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60008-UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60008-UNI-17253.cs
index 9021a372..9021a372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60008-UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60008-UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60009-UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60009-UNI-9917.cs
index 5e352d10..5e352d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60009-UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60009-UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60011-UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60011-UNI-11095.mm
index 4f88df51..4f88df51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60011-UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60011-UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60012-UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60012-UNI-12303.cs
index 01be8291..01be8291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60012-UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60012-UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60013-UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60013-UNI-13955.cs
index 940aa89b..940aa89b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60013-UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60013-UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60015-UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60015-UNI-14131.cs
index 9656bee8..9656bee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60015-UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60015-UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60016-UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60016-UNI-11662.cs
index 9a49fdba..9a49fdba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60016-UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60016-UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60018-UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60018-UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60018-UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60018-UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60019-UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60019-UNI-18780.cs
index 0eea713e..0eea713e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60019-UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60019-UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60020-UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60020-UNI-18829.cs
index a72ca87b..a72ca87b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60020-UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60020-UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60023-UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60023-UNI-18437.cs
index d8178e73..d8178e73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60023-UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60023-UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60024-UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60024-UNI-19644.cs
index eb0d4c9c..eb0d4c9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60024-UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60024-UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60026-UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60026-UNI-19895.cs
index 1fedd580..1fedd580 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60026-UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60026-UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60033-UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60033-UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60033-UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60033-UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60036-UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60036-UNI-11993.cs
index bf703537..bf703537 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60036-UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60036-UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60037-UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60037-UNI-29933.cs
index 943cbf35..943cbf35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60037-UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60037-UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60040-UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60040-UNI-30498_2.cs
index 445a7c97..445a7c97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60040-UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60040-UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
index 2fc371c3..2fc371c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
index 4f66d541..4f66d541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60043-UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60043-UNI-36862.cs
index cb3cb448..cb3cb448 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60043-UNI-36862.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60043-UNI-36862.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60044-UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60044-UNI-37241.cs
index 57d4ffeb..57d4ffeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60044-UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60044-UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60045-add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60045-add-nl-before-namespace.cs
index d9840704..d9840704 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/cs/60045-add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/cs/60045-add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40000-HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40000-HashMap.d
index 74d0614b..74d0614b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40000-HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40000-HashMap.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40001-imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40001-imports.d
index 9f12a88e..9f12a88e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40001-imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40001-imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40002-volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40002-volatile.d
index 4dbd66dc..4dbd66dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40002-volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40002-volatile.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40003-volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40003-volatile-1.d
index 2ef2634d..2ef2634d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40003-volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40003-volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40004-volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40004-volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40004-volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40004-volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40005-volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40005-volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40005-volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40005-volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40006-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40006-Lexer.d
index 86e1144a..86e1144a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40006-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40006-Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40007-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40007-Lexer.d
index 50f40a49..50f40a49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40007-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40007-Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40010-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40010-template.d
index 33a4155b..33a4155b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40010-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40010-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40011-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40011-template.d
index 5c106063..5c106063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40011-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40011-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40020-funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40020-funcfunc.d
index de673e78..de673e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40020-funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40020-funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40021-tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40021-tst01.d
index e19c7c8e..e19c7c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40021-tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40021-tst01.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40022-tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40022-tst02.d
index aa138a86..aa138a86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40022-tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40022-tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40023-bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40023-bug-indent.d
index 6071604d..6071604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40023-bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40023-bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40024-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40024-tst03.d
index 2344510d..2344510d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40024-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40024-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40025-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40025-tst03.d
index 15811ebc..15811ebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40025-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40025-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40026-wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40026-wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40026-wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40026-wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40027-static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40027-static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40027-static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40027-static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40030-delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40030-delegate.d
index 5f7beceb..5f7beceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40030-delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40030-delegate.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40035-enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40035-enum.d
index 24d0ef63..24d0ef63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40035-enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40035-enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40040-sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40040-sort_import.d
index db26c1e4..db26c1e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40040-sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40040-sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40050-strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40050-strings.d
index 4964ad7a..4964ad7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40050-strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40050-strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40051-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40051-numbers.d
index 72d55727..72d55727 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40051-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40051-numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40052-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40052-numbers.d
index 8cf51f29..8cf51f29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40052-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40052-numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40060-casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40060-casts.d
index b1d6b50b..b1d6b50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40060-casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40060-casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40061-const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40061-const.d
index 8277f0c1..8277f0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40061-const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40061-const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40070-d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40070-d_sp_paren.d
index cc38daae..cc38daae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40070-d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40070-d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40080-static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40080-static_if.d
index 0eb3a1a8..0eb3a1a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40080-static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40080-static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40090-square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40090-square_indent_tab.d
index e9657860..e9657860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40090-square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40090-square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40100-1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40100-1438.d
index 66c47d3a..66c47d3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40100-1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40100-1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40201-invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40201-invariant.d
index 3da6240f..3da6240f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40201-invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40201-invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40300-extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40300-extern_.d
index 40131d6d..40131d6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40300-extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40300-extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40400-vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40400-vbraces000.d
index 616bb259..616bb259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40400-vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40400-vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40401-vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40401-vbraces001.d
index 6d7e96f6..6d7e96f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40401-vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40401-vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40402-vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40402-vbraces002.d
index c966d140..c966d140 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40402-vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40402-vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40403-template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40403-template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40403-template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40403-template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40500-template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40500-template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40500-template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40500-template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40501-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40501-template_spacing001.d
index dc3242ff..dc3242ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40501-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40501-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40502-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40502-template_spacing001.d
index 3c238a1f..3c238a1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40502-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40502-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40503-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40503-template_spacing001.d
index 010cbe07..010cbe07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40503-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40503-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40504-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40504-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40504-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40504-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40505-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40505-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40505-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40505-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40506-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40506-type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/d/40506-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/d/40506-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/ecma/90000-example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/ecma/90000-example-1.es
index 45f9b6cb..45f9b6cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/ecma/90000-example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/ecma/90000-example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80000-assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80000-assert.java
index fbc20ba7..fbc20ba7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80000-assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80000-assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80010-annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80010-annotation1.java
index 314a0b91..314a0b91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80010-annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80010-annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80011-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80011-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80011-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80011-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80012-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80012-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80012-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80012-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80013-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80013-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80013-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80013-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80014-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80014-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80014-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80014-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80020-foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80020-foreach.java
index 69967517..69967517 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80020-foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80020-foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80030-variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80030-variable_aligns.java
index c73b62d3..c73b62d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80030-variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80030-variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80040-try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80040-try.java
index 78a55849..78a55849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80040-try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80040-try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80050-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80050-double_brace.java
index e00246e1..e00246e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80050-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80050-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80051-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80051-double_brace.java
index 66183ada..66183ada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80051-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80051-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80060-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80060-synchronized.java
index b8b70a6b..b8b70a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80060-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80060-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80061-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80061-synchronized.java
index 73fc9b1d..73fc9b1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80061-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80061-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80062-sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80062-sp_this_paren.java
index 1c189223..1c189223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80062-sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80062-sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80063-i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80063-i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80063-i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80063-i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80064-long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80064-long_cl_cmt.java
index af7a1c7e..af7a1c7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80064-long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80064-long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80065-Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80065-Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80065-Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80065-Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80066-sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80066-sp_after_for_colon.java
index 38515aed..38515aed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80066-sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80066-sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80067-doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80067-doxy-javadoc-alignment.java
new file mode 100644
index 00000000..6b9f748b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80067-doxy-javadoc-alignment.java
@@ -0,0 +1,74 @@
+/**
+ * @author  Firstname Lastname <address @ example.com>
+ * @version 1.6 (current version number of program)
+ * @since   1.2 (the version of the package to which this class was
+ *          first added)
+ */
+
+/**
+ * Short one line description.                           (1)
+ *
+ * Longer description. If there were any, it would be    (2) here.
+ *
+ * And even more explanations to follow in consecutive paragraphs
+ * separated by HTML paragraph breaks... or so we think, haha. After
+ * this paragraph, add a reference to an @param to verify that it is
+ * ignored since it does not occur at the beginning of the line. Let's
+ * also throw in an @return to verify that it passes the test as well.
+ *
+ * @param  variable Description text text text.          (3)
+ * @return          Description text text text.
+ */
+
+/**
+ * Validates a chess move.
+ *
+ * Use {@link #doMove(int fromFile, int fromRank, int toFile, int
+ * toRank)} to move a piece.
+ *
+ * @param  fromFile file from which a piece is being moved
+ * @param  fromRank rank from which a piece is being moved
+ * @param  toFile   file to which a piece is being moved
+ * @param  toRank   rank to which a piece is being moved
+ * @return          true if the move is valid, otherwise false
+ * @since           1.0
+ */
+
+/**
+ * Draws as much of the specified image as is currently available with
+ * its northwest corner at the specified coordinate (x, y). This
+ * method will return immediately in all cases, even if the entire
+ * image has not yet been scaled, dithered and converted for the
+ * current output device.
+ *
+ * If the current output representation is not yet complete then the
+ * method will return false and the indicated {@link ImageObserver}
+ * object will be notified as the conversion process progresses.
+ *
+ * @param  img      the image to be drawn
+ * @param  x, y     the x- and y-coordinates of the northwest corner
+ *                  of the destination rectangle in pixels
+ * @param  observer the image observer to be notified as more of the
+ *                  image is converted.  May be null
+ * @return          true if the image is completely loaded and was
+ *                  painted successfully; false otherwise.
+ * @see             Image
+ * @see             ImageObserver
+ * @since           1.0
+ */
+
+/**
+ * @see   #create(int, int, int, int)
+ * @see   #finalize()
+ * @see   Component#getGraphics()
+ * @see   Component#paint(Graphics)
+ * @see   Component#update(Graphics)
+ * @since 1.0
+ */
+
+/**
+ * Disposes of this graphics context once it is no longer referenced.
+ *
+ * @see   #dispose()
+ * @since 1.0
+ */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80100-sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80100-sf567.java
index 9fc644b8..9fc644b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80100-sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80100-sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80200-sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80200-sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80200-sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80200-sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80201-generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80201-generics.java
index 086786c0..086786c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80201-generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80201-generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80202-generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80202-generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80202-generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80202-generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80203-generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80203-generics_return_type.java
index 1f2aa340..1f2aa340 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80203-generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80203-generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80204-cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80204-cast.java
index 30d0dcc4..30d0dcc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80204-cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80204-cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80205-sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80205-sp_after_angle.java
index bd654485..bd654485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80205-sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80205-sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80206-annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80206-annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80206-annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80206-annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80300-Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80300-Issue_670.java
index b0aa2cf0..b0aa2cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80300-Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80300-Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80301-issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80301-issue_672.java
index 16a077a4..16a077a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80301-issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80301-issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80302-Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80302-Issue_1845.java
index 062c89d1..062c89d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80302-Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80302-Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80303-Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80303-Issue_1122.java
index 111ee739..111ee739 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80303-Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80303-Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80304-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80304-Issue_1124.java
index bca3cb33..bca3cb33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80304-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80304-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80305-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80305-Issue_1124.java
index 0469fed1..0469fed1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80305-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80305-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10018-delete-space-oc.mm
new file mode 100644
index 00000000..8760241b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10018-delete-space-oc.mm
@@ -0,0 +1,69 @@
+/* EditorApplication */

+

+#include <string>

+

+#ifdef __OBJC__

+#import <Cocoa/Cocoa.h>

+

+class HierarchyState;

+@interface EditorApplication : NSObject

+{

+	IBOutlet id m_MainWindow;

+	IBOutlet id m_PaneController;

+	id m_RenderTimer;

+

+	IBOutlet id m_CutItem;

+	IBOutlet id m_CopyItem;

+	IBOutlet id m_PasteItem;

+

+	IBOutlet id m_DuplicateItem;

+	IBOutlet id m_DeleteItem;

+

+	IBOutlet id m_FrameSelectedItem;

+	IBOutlet id m_FindItem;

+	IBOutlet id m_SelectAllItem;

+}

+

+- (IBAction)SaveAssets: (id)sender;

+- (IBAction)CloseScene: (id)sender;

+- (IBAction)NewProject: (id)sender;

+- (IBAction)OpenProject: (id)sender;

+

+- (IBAction)SaveAsSceneToDisk: (id)sender;

+

+- (IBAction)EnterSerialNumber: (id)sender;

+- (IBAction)ReturnLicense: (id)sender;

+- (IBAction)CompileScene: (id)sender;

+- (IBAction)CompileSceneAutomatic: (id)sender;

+

+- (IBAction)saveDocument: (id)sender;

+

+- (IBAction)LoadSceneFromDisk: (id)sender;

+

+- (void)RemoveDisplayTimer;

+- (void)RegisterUpdateTimer: (int)frequency;

+

+- (void)refreshModifiedFile: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

+- (void)closeFile: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

+

+- (IBAction)ShowAboutDialog: (id)sender;

+- (IBAction)ShowPreferences: (id)sender;

+- (IBAction)ShowPackageManager: (id)sender;

+

+- (IBAction) delete: (id)sender;

+- (IBAction) copy: (id)action;

+- (IBAction)paste: (id)action;

+- (IBAction)duplicate: (id)action;

+- (IBAction)cut: (id)action;

+- (IBAction)selectAll: (id)action;

+- (IBAction)find: (id)action;

+- (IBAction)frameSelected: (id)action;

+- (IBAction)frameSelectedWithLock: (id)action;

+

+// Assetstore protocol handler and registration

+- (void)registerAssetStoreURLProtocol;

+- (void)getUrl: (NSAppleEventDescriptor*)event withReplyEvent: (NSAppleEventDescriptor*)replyEvent;

+

+@end

+

+#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10019-func-param-wrap-oc.mm
index 45601228..45601228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10019-func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10019-func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10020-align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10020-align-objc-like-xcode.m
index 93066246..93066246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10020-align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10020-align-objc-like-xcode.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10021-double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10021-double-indent-objc-dict.m
index a93bd81e..a93bd81e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10021-double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10021-double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10022-indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10022-indent-objc-block.m
index 4aab0fc0..4aab0fc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/10022-indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/10022-indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50001-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50001-Fraction.h
index b1e373c2..b1e373c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50001-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50001-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50002-Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50002-Fraction.m
index 4ad6dfc8..4ad6dfc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50002-Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50002-Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50003-main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50003-main.m
index ec082dc1..ec082dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50003-main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50003-main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50004-string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50004-string.m
index bbfeb51e..bbfeb51e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50004-string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50004-string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50005-Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50005-Declarations.h
index 3b65c41c..3b65c41c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50005-Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50005-Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50006-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50006-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50006-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50006-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50007-misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50007-misc.m
index 4de222a1..4de222a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50007-misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50007-misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50008-protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50008-protocol.m
index 50c4314a..50c4314a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50008-protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50008-protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50009-literals.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50009-literals.mm
index f160ce5f..4bd99277 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50009-literals.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50009-literals.mm
@@ -30,7 +30,15 @@ void main(int argc, const char *argv[])
    NSNumber *noNumber  = @NO;           // equivalent to [NSNumber numberWithBool:NO]
 
    // Raw string literals
-   NSString *rawString = [NSString stringWithFormat:@R"(embedded "quotes ")"];
+   NSString *rawString          = [NSString stringWithFormat:@R"(embedded " quotes " )"];
+   NSString *delimiterRawString = [NSString stringWithFormat:@R"<<<(embedded "quotes ')<<<"];
+   NSString *groupIDString      = [NSString stringWithFormat:@R"({"group_id " : " % @",})", groupID];
+   NSString *config             = @R"({"config_v1" : [
+  {"op1" : {"type":{"unsupported1":{}}},"markers":[123]},
+  {"op2" : {"type":{"jobs":{"suspend":true,"resume":false}}},"markers":[1]},
+  {"op3" : {"type":{"Good Format":{}}},"markers":[123]}
+  ]})";
+
 
 #ifdef __cplusplus
    NSNumber *trueNumber  = @true;       // equivalent to [NSNumber numberWithBool:(BOOL)true]
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50010-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50010-return_type.m
index 62275a52..62275a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50010-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50010-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50011-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50011-return_type.m
index 7cc95485..7cc95485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50011-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50011-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50012-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50012-return_type.m
index 106c5466..106c5466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50012-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50012-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
index 847e9dca..847e9dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50015-receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50015-receiver.m
index dd6ee3d6..dd6ee3d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50015-receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50015-receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50016-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50016-ternary.m
index 42a573f4..42a573f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50016-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50016-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50017-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50017-ternary.m
index d53fc319..d53fc319 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50017-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50017-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50018-indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
index 0b6e1fa3..0b6e1fa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50020-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50020-selector.m
index c53db6fb..c53db6fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50020-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50020-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50021-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50021-selector.m
index 3442f700..3442f700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50021-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50021-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50022-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50022-selector.m
index 1d790cc9..1d790cc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50022-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50022-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50025-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50025-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50025-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50025-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50026-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50026-exceptions.m
index 150de092..150de092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50026-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50026-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50030-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50030-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50030-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50030-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50031-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50031-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50031-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50031-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50032-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50032-sort_import.m
index 37b4d643..37b4d643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50032-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50032-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50033-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50033-sort_import.m
index 7c2ab21f..7c2ab21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50033-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50033-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50034-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50034-sort_import.m
index f8a42242..f8a42242 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50034-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50034-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50035-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import.m
index f8a42242..f8a42242 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50035-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50035-sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import_group.m
index 251829df..251829df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50035-sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50035-sort_import_group.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50040-complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50040-complex_method.m
index 29467813..29467813 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50040-complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50040-complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50050-real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50050-real_world_file.m
index 1f7370d7..1f7370d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50050-real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50050-real_world_file.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50060-oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50060-oc-split.m
index a7bcd4de..a7bcd4de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50060-oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50060-oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50061-bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50061-bug_167.m
index 28087bb4..28087bb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50061-bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50061-bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50062-issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50062-issue_2631.m
index a4404650..a4404650 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50062-issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50062-issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50070-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50070-blocks.m
index 5b8e5d35..5b8e5d35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50070-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50070-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50071-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50071-blocks.m
index 5b8e5d35..5b8e5d35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50071-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50071-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50072-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50072-blocks.m
index 5b8e5d35..5b8e5d35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50072-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50072-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50073-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50073-blocks.m
index 9a08c6a0..9a08c6a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50073-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50073-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50074-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50074-blocks.m
index cb523489..cb523489 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50074-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50074-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50075-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50075-blocks.m
index 5b8e5d35..5b8e5d35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50075-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50075-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50076-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50076-blocks.m
index 5b8e5d35..5b8e5d35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50076-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50076-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50077-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50077-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50077-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50077-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50078-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50078-more_blocks.m
index 91d27d55..91d27d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50078-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50078-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50079-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50079-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50079-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50079-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50080-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50080-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50080-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50080-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50081-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50081-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50081-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50081-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50082-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50082-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50082-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50082-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50083-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50083-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50083-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50083-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50084-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50084-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50084-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50084-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50085-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50085-block_in_method.m
index 7a91d13e..7a91d13e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50085-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50085-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50086-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50086-block_in_method.m
index c5c9ae6b..c5c9ae6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50086-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50086-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
index af5c2b7b..af5c2b7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50090-kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50090-kw.m
index ef52dd8e..ef52dd8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50090-kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50090-kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50091-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50091-block_in_method.m
index 705435d8..705435d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50091-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50091-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50095-box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50095-box.m
index 45b0de1b..45b0de1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50095-box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50095-box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50100-bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50100-bug_340.m
index ec5135ab..ec5135ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50100-bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50100-bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50110-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50110-msg_align.m
index 041148c1..041148c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50110-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50110-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50111-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50111-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50111-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50111-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50112-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50112-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50112-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50112-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50113-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50113-ns_enum.m
index 5c30d740..5c30d740 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50113-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50113-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50120-gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50120-gh137.m
index ff41543a..ff41543a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50120-gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50120-gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50200-more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50200-more_blocks_2.m
index 8835454f..8835454f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50200-more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50200-more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50201-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50201-blocks_align.m
index 505c9b99..505c9b99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50201-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50201-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50202-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50202-blocks_align.m
index 439ac716..439ac716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50202-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50202-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50203-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50203-blocks_align.m
index 07bd3cf3..07bd3cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50203-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50203-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50204-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50204-blocks_align.m
index a2cefc1f..a2cefc1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50204-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50204-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50205-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50205-msg_align.m
index f024b44c..f024b44c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50205-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50205-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50206-issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50206-issue_2727.m
index 5639c298..5639c298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50206-issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50206-issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50207-issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50207-issue_3031.mm
new file mode 100644
index 00000000..75e6f5ea
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50207-issue_3031.mm
@@ -0,0 +1,4 @@
+if (flag) {
+	[video fcls:filter.class strength:fv];
+}
+[values forKey:(filterID)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50300-msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50300-msg.m
index 79c1a60a..79c1a60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50300-msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50300-msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50400-for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50400-for.m
index 35c34bce..35c34bce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50400-for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50400-for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50410-oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50410-oc_cond_colon.m
index 8059a3c6..8059a3c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50410-oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50410-oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50411-attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
index 49dfaefa..49dfaefa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50500-code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50500-code_placeholder.m
index f6a745ed..f6a745ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50500-code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50500-code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50510-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50510-gh293.m
index a1dffc49..a1dffc49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50510-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50510-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50511-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50511-gh293.m
index 6e4c180a..6e4c180a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50511-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50511-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50512-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50512-sp_oc_catch.m
index 6040b071..6040b071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50512-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50512-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50513-sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50513-sp_oc_boxed.m
index 916e9330..916e9330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50513-sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50513-sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50514-indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50514-indent_boxed.m
index 165ee244..165ee244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50514-indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50514-indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50515-sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50515-sp_oc_synchronized.m
index ffff5618..ffff5618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50515-sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50515-sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50600-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50600-bug_i_477.m
index 0e7cbb78..0e7cbb78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50600-bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50600-bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50601-bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_408.m
index 700d159d..700d159d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50601-bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50601-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_477.m
index 700d159d..700d159d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50601-bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50601-bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50602-bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50602-bug_i_125-412.m
index 4beec2d5..4beec2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50602-bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50602-bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50603-gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50603-gh511.m
index 2c86e32d..2c86e32d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50603-gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50603-gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50604-bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50604-bug_497.m
index 121503b4..121503b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50604-bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50604-bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50605-bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50605-bug_404.m
index 8244ebd3..8244ebd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50605-bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50605-bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50606-bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50606-bug_1366.m
index f4058b1f..f4058b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50606-bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50606-bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
index 14eaed36..14eaed36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50608-blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50608-blocks_align2.m
index b37c1b4b..b37c1b4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50608-blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50608-blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50609-negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50609-negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50609-negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50609-negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50610-nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50610-nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50610-nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50610-nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50611-for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50611-for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50611-for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50611-for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50612-chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50612-chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50612-chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50612-chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50613-chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50613-chunk_ends_type2.m
index 64efc7e6..64efc7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50613-chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50613-chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50614-chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50614-chunk_ends_type3.m
index 8f0ae62c..8f0ae62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50614-chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50614-chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50615-block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50615-block_literal_protocol.m
index 35879a0e..35879a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50615-block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50615-block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50616-oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50616-oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50616-oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50616-oc_msg_in_pp.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50617-boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50617-boxed_receiver.m
index e4c247fd..e4c247fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50617-boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50617-boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50618-func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50618-func_def.mm
index 49de2fea..49de2fea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50618-func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50618-func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50619-cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50619-cast.m
index 1e588579..1e588579 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50619-cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50619-cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50620-sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50620-sp_after_angle.m
index 318071ba..318071ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50620-sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50620-sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50621-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50621-Fraction.h
index 77403abd..77403abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50621-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50621-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
index f17c10ed..f17c10ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50623-extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50623-extern-c-attribute.m
index 1c752682..1c752682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50623-extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50623-extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50624-typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50624-typeof.m
index 968aad5a..968aad5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50624-typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50624-typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
index f98a27ea..f98a27ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50626-chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50626-chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50626-chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50626-chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50627-method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50627-method_ends_semicolon.m
index b1ca36fa..b1ca36fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50627-method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50627-method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50628-macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50628-macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50628-macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50628-macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50629-pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50629-pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50629-pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50629-pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
index e423c05a..e423c05a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50630-react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-react_native.m
index 657e90d0..657e90d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50630-react_native.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50630-react_native.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50700-cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50700-cmt_insert.m
index ec94c42b..ec94c42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50700-cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50700-cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50701-cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50701-cmt_insert2.m
index 7a90cc57..7a90cc57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50701-cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50701-cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50800-properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50800-properties.m
index fa9ca930..fa9ca930 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50800-properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50800-properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50801-i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50801-i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50801-i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50801-i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50802-available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50802-available.m
index 5054043a..5054043a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50802-available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50802-available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50803-indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50803-indent_single_newline.m
index a70184e5..a70184e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50803-indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50803-indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50804-issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50804-issue_2629.m
index 6d6cbf30..6d6cbf30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50804-issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50804-issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50805-issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50805-issue_2724.m
index 23241732..23241732 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50805-issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50805-issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50810-bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50810-bug_841.m
index 8e8a6713..8e8a6713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50810-bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50810-bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50811-bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50811-bug_1674.m
index 7d23b230..7d23b230 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50811-bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50811-bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50812-bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50812-bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50812-bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50812-bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50813-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
index 65d13399..65d13399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50814-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
index be1f49ed..be1f49ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50815-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
index 1fef0cc4..1fef0cc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50816-issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50816-issue_2675.m
index ccb80f6b..ccb80f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50816-issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50816-issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50817-issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50817-issue_2722.m
index 8919895a..8919895a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50817-issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50817-issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50900-1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50900-1927.m
index 3ae39e47..3ae39e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50900-1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50900-1927.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50901-Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50901-Issue_2172.m
index efa73591..efa73591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50901-Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50901-Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50902-Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50902-Issue_2289.m
index 19fe5cdf..19fe5cdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50902-Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50902-Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50903-Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50903-Issue_681.oc
index 1e71cdaa..1e71cdaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50903-Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50903-Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50904-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50904-double_angle_space.m
index 0e6c0c0c..0e6c0c0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50904-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50904-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50905-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50905-double_angle_space.m
index 9636a38e..9636a38e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50905-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50905-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50906-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50906-double_angle_space.m
index 5c16c25f..5c16c25f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/oc/50906-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/oc/50906-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60000-functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60000-functions.pawn
index 853c70ad..853c70ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60000-functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60000-functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60001-comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60001-comment.p
index f63deb62..f63deb62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60001-comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60001-comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60002-traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60002-traffic.p
index a902e497..a902e497 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60002-traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60002-traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60003-tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60003-tags.pawn
index 038101c3..038101c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60003-tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60003-tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60004-enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60004-enum.pawn
index c2bc8b62..c2bc8b62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60004-enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60004-enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60005-unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60005-unbraced.p
index 1a22a3af..1a22a3af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60005-unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60005-unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60010-str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60010-str-escape.p
index 3aa54453..3aa54453 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60010-str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60010-str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60020-switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60020-switch-vsemi.sma
index a0c720f7..a0c720f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60020-switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60020-switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60030-crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60030-crusty_ex-1.sma
index 23e042dd..23e042dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60030-crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60030-crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60040-preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60040-preproc.pawn
index 6df8101f..6df8101f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60040-preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60040-preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60050-gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60050-gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60050-gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60050-gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60100-Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60100-Issue_2586.pawn
index d93360ab..d93360ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/pawn/60100-Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/pawn/60100-Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/02400-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02400-mysql.sqc
index ec8ad604..ec8ad604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/02400-mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02400-mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/02401-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02401-sta-select.sqc
index 1142c3b9..1142c3b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/02401-sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02401-sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/02402-issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02402-issue_527.sqc
index 17ccfa3b..17ccfa3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/02402-issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/02402-issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/21000-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21000-mysql.sqc
index f8b6004e..f8b6004e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/21000-mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21000-mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/21001-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21001-sta-select.sqc
index 1142c3b9..1142c3b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/sql/21001-sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/sql/21001-sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70000-list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70000-list.vala
index 1893dcb5..1893dcb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70000-list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70000-list.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70001-advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70001-advanced.vala
index ca88a821..ca88a821 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70001-advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70001-advanced.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70010-verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70010-verbatim_str.vala
index fb0824ae..fb0824ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70010-verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70010-verbatim_str.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70011-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70011-verbatim_str2.vala
index c607d7b4..c607d7b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70011-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70011-verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70012-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70012-verbatim_str2.vala
index c253b86b..c253b86b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70012-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70012-verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70020-preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70020-preproc.vala
index 9cc1ba1a..9cc1ba1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70020-preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70020-preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70287-gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70287-gh287.vala
index be39a9db..be39a9db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70287-gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70287-gh287.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70300-Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70300-Issue_2090.vala
index 5b4e1716..5b4e1716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70300-Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70300-Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70301-Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70301-Issue_2270.vala
index 2202627c..2202627c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/expected/vala/70301-Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/expected/vala/70301-Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/fixtest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/fixtest.sh
index 76fac4bf..76fac4bf 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/fixtest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/fixtest.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/imported.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/imported.test
index b20f0247..b20f0247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/imported.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/imported.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/1225.c
index c6533cb1..c6533cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue-2278.c
index 1ecfecf5..1ecfecf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue-2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2360.c
index dd4530c7..dd4530c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/add_long_comment.c
index 5900de52..5900de52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-equ.c
index 374ccbfb..374ccbfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto-vars.c
index e1dd71ff..e1dd71ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto.c
index 64dfce00..64dfce00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-string.c
index f652e88f..f652e88f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-struct-init.c
index 084994ff..084994ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-typedef.c
index ae17eb4d..ae17eb4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-var.c
index adbf8a98..adbf8a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_attr.c
index 0f4cfee1..0f4cfee1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_keep_extra.c
index 2bc0f532..2bc0f532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_keep_extra.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_418.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_419.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_416.c
index f4f6606e..f4f6606e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_417.c
index c3c881eb..c3c881eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_stack.c
index 0f88df06..0f88df06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/align_stack.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/asm.c
index 1fb5015c..1fb5015c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/attribute.c
index babe229f..babe229f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/backslash-newline-lex.c
index 0f20388c..0f20388c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/beautifier-off.c
index 033179cb..033179cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bits.c
index 9a12f484..9a12f484 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bool-pos.c
index d6887223..d6887223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/br_cmt.c
index 4e57d2de..4e57d2de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove.c
index c62506e3..c62506e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove2.c
index e5b73723..e5b73723 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove3.c
index 9cde8bbd..9cde8bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace.c
index 31f3b42b..31f3b42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-2.c
index a34d73d8..a34d73d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-3.c
index 1f1a2066..1f1a2066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-4.c
index 385f4a8e..385f4a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-5.c
index c77cc912..c77cc912 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces.c
index 20733afc..20733afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bsnl.c
index b2b38b8e..b2b38b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1041.c
index 193c750b..193c750b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1702.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_2331.c
index f30c53d3..f30c53d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_3156.c
new file mode 100644
index 00000000..508a0098
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_3156.c
@@ -0,0 +1,2 @@
+#define X 1 +
+int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_489.c
index e83d351b..e83d351b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_671.c
index 01a3b02b..01a3b02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_771.c
index c933487d..c933487d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_771.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_876.c
index ab2a05db..ab2a05db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-1.c
index 39050c07..39050c07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-3.c
index 4f85044a..4f85044a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-4.c
index e01c2c32..e01c2c32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-5.c
index 626eb7e6..626eb7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-6.c
index 99ebbdda..99ebbdda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-7.c
index a879aa17..a879aa17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-8.c
index 8870a663..8870a663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs.c
index d75a4782..d75a4782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/bugs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/bugs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case-nl_before_return.c
index 67adaddd..67adaddd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case.c
index ffceda0e..ffceda0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cast_brace.c
index 7ec7f67a..7ec7f67a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cast_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/casts.c
index f09f5c5e..f09f5c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/clang-has_include.h
index d153e70a..d153e70a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt-align.c
index 658bac4d..658bac4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi.c
index 8e01c5fc..8e01c5fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_nl_end.c
index 48929d07..48929d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_reflow.c
new file mode 100644
index 00000000..6c40e11b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_reflow.c
@@ -0,0 +1,32 @@
+/**
+  * Search the tree for a match that satisfies specific comparison criteria,
+  *                 branch contains the desired data for which to search the tree
+  * @param compareFunc is a binary function object that defines
+  *                                                                how to compare
+  *    nodes
+  * @param bRetrieve indicates whether or not the input search branch should be modified to reflect a branch in the tree, assuming a match satisfying the given search criteria exists
+  * @return true if a branch matching the input is found
+  *                    or returns nullptr otherwise
+  *
+  *    It was the best of times, it was the worst of times,
+  *           it was the age of wisdom, it was the age of foolishness, it was the epoch of belief,
+  *        it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope,
+  *            it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven,
+  *        we were all going direct the other way--in short, the period was so far like the present period, that some of its noisiest authorities insisted
+  *                                     on its being received, for good or for evil, in the superlative degree of comparison only.
+  *
+  *        There were a king with a large jaw and a queen with a plain face
+  *                      on the throne of England; there were a king with a large jaw and a queen with a fair
+  *                                 face,
+  *                           on the throne of France. In both countries it was clearer than crystal to the lords of the
+  *                           State preserves of loaves and fishes, that things in general were settled for ever.
+  *
+  *            It was the year of Our Lord one thousand seven hundred and seventy-five.
+  *                                                 Spiritual revelations were conceded to England at that favoured period, as at this. Mrs.
+  *                                       Southcott had recently attained her five-and-twentieth blessed birthday, of whom a prophetic private in the Life
+  *                 Guards had heralded the sublime appearance by announcing that arrangements were made for the swallowing up of London and Westminster.
+  *           Even the Cock-lane ghost had been laid only a round dozen of years, after rapping out its messages, as the spirits of this very year last past
+  *                           (supernaturally deficient in originality) rapped out theirs. Mere messages in the earthly order of events had lately come to
+  *                     the English Crown and People, from a congress of British subjects in America: which, strange to relate, have proved more important
+  *               to the human race than any communications yet received through any of the chickens of the Cock-lane brood.
+  */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_right_align.c
index b707f0bb..b707f0bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/code_width.c
index 1b2fbbaa..1b2fbbaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/colon-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/colon-asm.c
index 5125af19..5125af19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/colon-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/colon-asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-convert.c
index 4282ab0b..4282ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-indent.c
index d5295d6e..d5295d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cond.c
index aec2f0a3..aec2f0a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/custom_types_ssl.c
index 0454f81d..0454f81d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/define-if-indent.c
index 1ef47273..1ef47273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/deref.c
index 100464fb..100464fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/directfb.h
index 3531fa21..3531fa21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/dos.c
index 108c3b1c..108c3b1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/doxy-comment.c
index ef0414ac..ef0414ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/empty-for.c
index d9fb686a..d9fb686a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/endif.c
index fd621299..fd621299 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/enum-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum-struct-init.c
index 6660e4a4..6660e4a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/enum-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_comma_ifdef.c
index aa80cf48..aa80cf48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_gallery.c
index 2be93194..2be93194 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/extern.c
index 3bcfcbe5..3bcfcbe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent.c
index ff9f812b..ff9f812b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent_func_def_col1.c
index 235731c2..235731c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_type.c
index d49d381d..d49d381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/for-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/for-space.c
index 1064d493..1064d493 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/for-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/for-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/freebsd.c
index c9ef164f..c9ef164f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/freebsd.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user.c
index 275d8c5e..275d8c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user2.c
index 38ecb232..38ecb232 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_call_user2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_wrap.c
index 7589d03b..7589d03b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/funcfunc.c
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/function-def.c
index 778d121f..778d121f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/gh399.c
index 00f868a3..00f868a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/global-vars.c
index 9576341b..9576341b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/hello.c
index 5849783c..5849783c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1564.c
index c906ef9b..c906ef9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i2c-core.c
index 29bdb584..29bdb584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/if_chain.c
index 948492dd..948492dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-indent.c
index 5043c01f..5043c01f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/ifdef-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-nest.c
index 68baf1fc..68baf1fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/ifdef-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/ifdef-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/include_define.h
index 13380cac..13380cac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-assign.c
index 58ed9c52..58ed9c52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-macro-brace.c
index 8c3f9941..8c3f9941 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-off-after-assign.c
index d01f58c0..d01f58c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-off-after-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-vbrace.c
index 8b48e235..8b48e235 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_first_bool_expr.c
index ec68ac3a..ec68ac3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-1.c
index b76e375b..b76e375b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-2.c
index 20f1df64..20f1df64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/indent_ternary-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/kw_subst.c
index 5d37f823..5d37f823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/lvalue.c
index 2f2cc17d..2f2cc17d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/lvalue.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mac.c
index ce4e7937..ce4e7937 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/macro-returns.c
index 0febb263..0febb263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/minus-minus.c
index 4eb69237..4eb69237 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/minus-minus.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/misc.c
index cd948007..cd948007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod-paren.c
index 14bb9836..14bb9836 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod_case_brace.c
index 4bd9abde..4bd9abde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/multi.h
index 33acea34..33acea34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/my_infile.c
index 8b8cd113..8b8cd113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-comment.c
index 70c49200..70c49200 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont.c
index 9f87950f..9f87950f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont2.c
index b3f079e3..b3f079e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-cont2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-semicolon.c
index 8e0f59d3..8e0f59d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-semicolon.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-ver-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-ver-def.c
index 9684ed27..9684ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl-ver-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl-ver-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_assign.c
index b2495c13..b2495c13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_before_return.c
index da5ed3eb..da5ed3eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_create_one_liner.c
index 16887eca..16887eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_ds_struct_enum.c
index d19964ae..d19964ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_endif.c
index d738d74a..d738d74a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_return_expr.c
index e917e399..e917e399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-define.c
index fdb02e31..fdb02e31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-init.c
index 91d92d55..91d92d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one_liners.c
new file mode 100644
index 00000000..1f6e0d3e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/one_liners.c
@@ -0,0 +1,12 @@
+int baz() { return 0; }
+
+int main()
+{
+int a, b;
+int f[2] = { 1, 2 };
+enum foo { BAR = 15 };
+if (1) { a++; b++; }
+while (0) { a++; b++; }
+do { a++; b++; } while (0);
+for (;;) { a++; b++; };
+}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren-indent.c
index df5b1c14..df5b1c14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren_indent.c
index 4b0ff447..4b0ff447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pascal_ptr.c
index 5b0116ba..5b0116ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_compare.c
index b0942de0..b0942de0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_conditional.c
index 100545e5..100545e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-if-indent.c
index cd9d6c4d..cd9d6c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-nest.c
index b602471b..b602471b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-space.c
index 67cf3e55..67cf3e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_concat_asn1.h
index 9874cf04..9874cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp_concat_asn1.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_concat_asn1.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_ret.c
index c35e4294..c35e4294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pp_ret.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma.c
index a0dcd975..a0dcd975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma_asm.c
index a7834613..a7834613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/preproc-if.c
index 71fbf792..71fbf792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-compound-literal.c
index 8547c3a7..8547c3a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-multi.c
index 846ca21c..846ca21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/semicolons.c
index d7e2379a..d7e2379a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf594.c
index cd08cce6..cd08cce6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sort_include.c
index 0f1956d2..0f1956d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_after_sparen.c
index 8a86dd25..8a86dd25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_after_sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_cmt_cpp_start.c
index b9b07287..b9b07287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_embed_comment.c
index 88a54dff..88a54dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_func_call_user_inside_fparen.c
index ba921b9f..ba921b9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sparen-indent.c
index fe770681..fe770681 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/struct-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/struct-brace.c
index 7d08b4ca..7d08b4ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/struct-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/struct-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/switch-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch-case.c
index add9fcfa..add9fcfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/switch-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch.c
index 5b760363..5b760363 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/t3.in.c
index e352f736..e352f736 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type-cast.c
index 5760b466..5760b466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type_wrap.c
index 13b74455..13b74455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/utf8-identifiers.c
index e3281aac..e3281aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vardefcol.c
index bdb40e8f..bdb40e8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vardefcol.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/various_colons.c
index 516a5a72..516a5a72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-do.c
index 1cefd1df..1cefd1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-pp.c
index 5ea209c5..5ea209c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-while.c
index 22291748..22291748 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/vb-while.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/whole_file_ifdef.c
index bb16e116..bb16e116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/xml.c
index fe7afdf4..fe7afdf4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/c/xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/c/xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp
index e0379b43..e0379b43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp
index 4a2c05fa..4a2c05fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp
index a6aface7..a6aface7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp
index ad1ed6f7..ad1ed6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp
index 4e18c597..4e18c597 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp
index 3c4f3b9e..3c4f3b9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp
index dfa5a906..dfa5a906 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h
index deede79a..deede79a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp
index 365df31f..365df31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp
index c3765ce4..c3765ce4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp
index 6c48cb63..6c48cb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp
index ba6386dd..ba6386dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp
index 19461b71..19461b71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp
index 6a9042c2..6a9042c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp
index 7c69e7fb..7c69e7fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp
index 4a2c97b5..4a2c97b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp
index bca40664..bca40664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp
index fd8b1384..fd8b1384 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp
index bf5530c3..bf5530c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp
index 9c02605a..9c02605a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp
index 93e0799c..93e0799c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp
index 0c07555d..0c07555d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp
index e5b3ceeb..e5b3ceeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp
index 80b7ddc7..80b7ddc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp
index 94d0aa28..94d0aa28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp
index 627eba3f..627eba3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp
index ad53fa57..ad53fa57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp
index 88fb2249..88fb2249 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp
index dce02df3..dce02df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp
index 543b9827..543b9827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp
index beeffc7e..beeffc7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp
index c9cbacda..c9cbacda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp
index 3573b20d..3573b20d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp
index cb6e24bf..cb6e24bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp
index 65382eb9..65382eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp
index 9f575dc1..9f575dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp
index 7632ed27..7632ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp
index 5dbc4fbe..5dbc4fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp
index 44b9e75f..44b9e75f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp
index 4763c574..4763c574 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp
index 1b35ac11..1b35ac11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg
index 955a1f9a..955a1f9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp
index 837b0506..837b0506 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp
index 9478d63e..9478d63e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp
index 08d0556b..08d0556b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp
index af00e16e..af00e16e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp
index c919d5a5..c919d5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp
index 2a64bd8f..2a64bd8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp
index fbcfec1f..fbcfec1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp
index 15232fc4..15232fc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp
index fc79cd0d..fc79cd0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp
index 798a719a..798a719a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp
index e73c67a8..e73c67a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp
index 1e2f5d02..1e2f5d02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp
new file mode 100644
index 00000000..0b394620
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp
@@ -0,0 +1,7 @@
+{
+std::vector<Object> someVector = {
+  flag && (hasFeedback != nil)
+  ? objectA
+  : objectB,
+};
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp
index ef3b5a4b..ef3b5a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp
index 4173ad5d..4173ad5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp
index 7b76eb43..7b76eb43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp
index 7b85c0ec..7b85c0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp
index f83e3536..f83e3536 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp
new file mode 100644
index 00000000..9d76fe44
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp
@@ -0,0 +1,7 @@
+
+#define FOO \
+\
+    int my_type; \
+    int a; \
+    float b; \
+    double c;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp
index 237c8ce1..237c8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp
index 3c84969b..3c84969b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp
index 1ac9a86e..1ac9a86e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp
new file mode 100644
index 00000000..cbe9c4a5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp
@@ -0,0 +1,6 @@
+Foo::Foo(int a,
+         int b)
+    : a_(a),  // the comment should stay here
+      b_(b)
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp
new file mode 100644
index 00000000..03f2ae4c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp
@@ -0,0 +1,14 @@
+int
+main()
+{
+int i, j, k, l, m, q;
+
+i = rand();
+k = rand();
+l = rand();
+m = rand();
+j = rand();
+q = i * j + (2 * l) /m - ( 100 * k ) + k * k - i * i + 3000 * j + 1000 ; /* this is a very long trailing c comment */
+
+// the trailing * */ above should be */
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp
new file mode 100644
index 00000000..eb0228c9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp
@@ -0,0 +1,3 @@
+namespace farm::animal::chicken::leg
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp
index f2dc1717..f2dc1717 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp
new file mode 100644
index 00000000..44272d56
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp
@@ -0,0 +1,4 @@
+module x;
+static if (1) {{
+    int x;
+}}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp
index af3020d3..af3020d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp
index 294c5e85..294c5e85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp
new file mode 100644
index 00000000..0474c710
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp
@@ -0,0 +1 @@
+ValuePrimaryKey<int64_t, Schema, ColumnId1{0}> id = { kTableName, kColumnNameId };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp
index cea47724..cea47724 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp
index 9d42a72d..9d42a72d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp
index 43e19e96..43e19e96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp
index 9b130982..9b130982 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp
index e5bc781f..e5bc781f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp
new file mode 100644
index 00000000..b546e7be
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp
@@ -0,0 +1,16 @@
+namespace SomeLongNamespaceName {
+class Foo { };
+}
+
+class Bar : SomeLongNamespaceName::Foo {
+public:
+Bar()
+        : SomeLongNamespaceName::Foo(),
+             myNumber(3), // <-- this line
+             myOtherNumber(5)
+{
+}
+private:
+int myNumber;
+int myOtherNumber;
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp
new file mode 100644
index 00000000..ddbb473e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp
@@ -0,0 +1,7 @@
+class Class
+{
+int fa();
+int* fpa();
+int fb();
+int& frb();
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp
new file mode 100644
index 00000000..9e64526e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp
@@ -0,0 +1,2 @@
+int a;// Рука
+int d;/* Рука */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp
new file mode 100644
index 00000000..b91f431d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp
@@ -0,0 +1,13 @@
+void main()
+{
+	while (*stringcur)
+	{
+#ifdef NO8BIT
+		if (((*bufcur++ ^ *stringcur) & 0x7F) != 0)
+#else /* NO8BIT */
+		if (*bufcur++ != *stringcur)
+#endif /* NO8BIT */ /* Issue #3034 */
+                        break;
+	}
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp
new file mode 100644
index 00000000..fe9aed25
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp
@@ -0,0 +1,57 @@
+int main()
+{
+  switch (opcode)
+  {
+    case 1:
+      return Number(localeCompare(s, a0.toString(exec)));
+
+#ifndef A
+    case 2:
+      result = String("<big>" + s + "</big>");
+      break;
+#endif
+
+  }
+
+  switch (ev->command)
+  {
+    case (3):
+      ev->note = *ptrdata; ptrdata++; currentpos++;
+      ev->vel  = *ptrdata; ptrdata++; currentpos++;
+      if (ev->vel==0)
+	note[ev->chn][ev->note]=FALSE;
+      else
+	note[ev->chn][ev->note]=TRUE;
+
+#ifdef B
+      if (ev->chn==6) {
+	if (ev->vel==0) printfdebug("Note Onf\n");
+	else printfdebug("Note On\n");
+      };
+#endif
+      break;
+    case (4) :
+#ifdef C
+      if (ev->chn==6) printfdebug("Note Off\n");
+#endif
+      ev->note = *ptrdata;ptrdata++;currentpos++; 
+      ev->vel  = *ptrdata;ptrdata++;currentpos++;
+      note[ev->chn][ev->note]=FALSE;
+
+      break;
+    case (5) :
+#ifdef D
+      if (ev->chn==6) printfdebug ("Key press\n");
+#endif
+      ev->note = *ptrdata;ptrdata++;currentpos++; 
+      ev->vel  = *ptrdata;ptrdata++;currentpos++;
+      break;
+
+#ifndef E
+    case 6:
+      result = String("<big>" + s + "</big>");
+      break;
+#endif
+		}
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp
new file mode 100644
index 00000000..739b1305
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp
@@ -0,0 +1,38 @@
+int main()
+{
+  int af;
+  int A;
+  int B;
+  switch (af)
+    {
+    case 1:
+      B = 2;
+    case 2:
+      return 1;
+    case 3:
+      A = 1;
+      break;
+#ifdef ALL_THE_CASE
+    case 4:
+      return 2;
+#endif
+#ifdef ALL_THE_CASE
+    case 5:
+      B = 2;
+#endif
+    case (6):
+      B=13;
+#ifdef PART_OF_THE_CASE_UNDER
+      A=1;
+#endif
+      break;
+    case (7) :
+#ifdef PART_OF_THE_CASE_ABOVE
+      A=5;
+#endif
+      B=7;
+      break;
+    default:
+      B= 50;
+    }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp
new file mode 100644
index 00000000..678d6ce4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp
@@ -0,0 +1,40 @@
+int main()
+{
+  int sa_family;
+  int d;
+  int scopeid;
+  switch (sa_family)
+    {
+    case 1:
+#ifdef AF_INET6
+      if (d == 1)
+	scopeid = 1;
+      else
+	scopeid = 2;
+      return 5;
+#else
+      return 6;
+#endif
+
+    case 2:
+#ifdef AF_INET6
+      TQString scopeid("%");
+      if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
+	scopeid += TQString::number(d->addr.in6->sin6_scope_id);
+      else
+	scopeid.truncate(0);
+      return d->ref.ipAddress().toString() + scopeid;
+#endif
+
+    case 3:
+#ifdef AF_INET6
+      TQString scopeid("%");
+      if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
+	scopeid += TQString::number(d->addr.in6->sin6_scope_id);
+      else
+	scopeid.truncate(0);
+      return d->ref.ipAddress().toString() + scopeid;
+#endif
+    }
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp
new file mode 100644
index 00000000..cb468be3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp
@@ -0,0 +1,11 @@
+#define VTABLE_DECLARE                                            \
+	extern struct vtable_struct_name_macro vtable_base_macro; \
+	struct vtable_struct_name_macro
+
+#define VTABLE_METHOD(retvalue, method, args ...) \
+	retvalue(*method)(args)
+
+VTABLE_DECLARE {
+	VTABLE_METHOD(int, get, const char *name);
+	VTABLE_METHOD(int, set, const char *name, int value);
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp
new file mode 100644
index 00000000..77d0d337
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp
@@ -0,0 +1,6 @@
+void func(){
+  parallel_for(0, 100, [&](int aaaaaa, int bbbbbbb, int ccccccc, int ddddddd, const int eee){
+    // do something
+    return a;
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp
new file mode 100644
index 00000000..2d8b38d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp
@@ -0,0 +1,7 @@
+void func()
+{
+  parallel_for(0, 100, [ & ] ( const int i ) {
+    const std::vector<int> values = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
+    return values[i];
+  });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp
new file mode 100644
index 00000000..85c9b7e8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp
@@ -0,0 +1,13 @@
+#ifndef ABC
+#     define ABC
+
+#ifdef XYZ1
+extern "C" {
+#endif
+
+#ifdef XYZ2
+}
+#endif
+
+#endif
+int a;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp
new file mode 100644
index 00000000..4d66bbf3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp
@@ -0,0 +1,12 @@
+#ifndef ABC
+#     define ABC
+
+#ifdef XYZ1
+extern "C" {
+#endif
+
+#ifdef XYZ2
+}
+#endif
+
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp
new file mode 100644
index 00000000..f94e88e7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp
@@ -0,0 +1,70 @@
+KJS::Value KJS::KateJSViewProtoFunc::call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args)
+{
+  switch (id)
+  {
+    case KateJSView::SetCursorPositionReal:
+      return KJS::Boolean( view->setCursorPositionReal( args[0].toUInt32(exec), args[1].toUInt32(exec) ) );
+
+    // SelectionInterface goes in the view, in anticipation of the future
+    case KateJSView::Selection:
+      return KJS::String( view->selection() );
+  }
+
+  return KJS::Undefined();
+}
+
+void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
+                                 uint &attrCol, bool &unclosedTag)
+{
+  for(pos = 0; pos < len; ++pos) {
+    int ch = text.at(pos).unicode();
+    switch(ch) {
+      case '<':
+        ++numTags;
+        break;
+
+      // don't indent because of DOCTYPE, comment, CDATA, etc.
+      case '!':
+        if(lastCh == '<') --numTags;
+        break;
+
+      // don't indent because of xml decl or PI
+      case '?':
+        if(lastCh == '<') --numTags;
+        break;
+    }
+  }
+}
+
+static YYSIZE_T yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+  {
+    for (;;)
+      switch (*++yyp)
+      {
+        case '\\':
+          if (*++yyp != '\\')
+            yyres[yyn] = *yyp;
+        /* Fall through.  */
+        default:
+          if (yyres)
+            yyres[yyn] = *yyp;
+          yyn++;
+          break;
+      }
+  }
+  return yystpcpy (yyres, yystr) - yyres;
+}
+
+Value RegExpProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args)
+{
+  if (!thisObj.inherits(&RegExpImp::info)) {
+    if (thisObj.inherits(&RegExpPrototypeImp::info)) {
+      switch (id) {
+        case ToString: return String("//"); // FireFox returns /(?:)/
+      }
+    }
+    return err;
+  }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp
new file mode 100644
index 00000000..2a76b5a3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp
@@ -0,0 +1,8 @@
+DCOPClient::DCOPClient()
+{
+	TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this,
+	        TQT_SLOT(processPostedMessagesInternal()));
+	TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp
new file mode 100644
index 00000000..fd369e24
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp
@@ -0,0 +1,8 @@
+DCOPClient::DCOPClient()
+{
+	TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this,
+	        TQT_SLOT(processPostedMessagesInternal()));
+	TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp
new file mode 100644
index 00000000..25906e08
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp
@@ -0,0 +1,9 @@
+DCOPClient::DCOPClient()
+{
+	TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this,
+	        TQT_SLOT(processPostedMessagesInternal()));
+	TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout()));
+}
+
+#include <dcopclient.moc>
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp
new file mode 100644
index 00000000..75c6072b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp
@@ -0,0 +1,2 @@
+auto j = int{0};
+auto j = decltype(int){0};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp
new file mode 100644
index 00000000..04119de3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp
@@ -0,0 +1,8 @@
+void foo()
+{
+    for( unsigned p = 0; p < np;
+         ++p )
+    {
+      double* o = bar[p];
+    }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp
new file mode 100644
index 00000000..63090f4a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp
@@ -0,0 +1 @@
+#define CONTINUE_IF(expr) { if ((expr)) continue; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp
index 90084874..90084874 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp
index 05eca611..05eca611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp
index 01e7cc97..01e7cc97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
index b0e13d6a..b0e13d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp
index ee6239f9..ee6239f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp
index 37156618..37156618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp
index a0fb07d5..a0fb07d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
index 5a4c8e7d..5a4c8e7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h
index 60dc3791..60dc3791 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp
index 3228cf2a..3228cf2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp
index 9cc7b13f..9cc7b13f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp
index 38ded76c..38ded76c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp
index 278cd1a2..278cd1a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp
index 2f3ad2a2..2f3ad2a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp
index 2f743294..2f743294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp
index c898df76..c898df76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp
index 0261a306..0261a306 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp
index ac2184f0..ac2184f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp
index 8a1aab54..8a1aab54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp
index 770bf0c1..770bf0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp
index 0c40e831..0c40e831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp
index a20f4c43..a20f4c43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp
index ef5fe7cf..ef5fe7cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp
index 7c64f76a..7c64f76a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp
index 5da60d3f..5da60d3f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp
index a6cf3fc5..a6cf3fc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-29935.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp
index 9151231a..9151231a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp
index f6dba01b..f6dba01b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp
index 3c232dec..3c232dec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp
index 0ba91720..0ba91720 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp
index 2e55d59d..2e55d59d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp
index 29a7a23a..29a7a23a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp
index f47f0c80..f47f0c80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp
index 0c816099..0c816099 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
index 4b325b1e..4b325b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp
index 2be3c8e8..2be3c8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp
index d47e77bb..d47e77bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp
index de21686c..de21686c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp
index c27ed9d1..c27ed9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp
index a90155fd..a90155fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp
index df6b4dca..df6b4dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp
index b0960a11..b0960a11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp
index 3cf7a744..3cf7a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp
index c90ae71f..c90ae71f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp
index 3942f227..3942f227 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp
index fcaf1392..fcaf1392 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp
index 0cf8426d..0cf8426d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp
index 744b3404..744b3404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h
index 7a90197c..7a90197c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp
index b593255b..b593255b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/block_pointer.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp
index 9c7ac70b..9c7ac70b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/block_pointer.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp
index 30d4cb29..30d4cb29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp
index ef8b96ed..ef8b96ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp
index e245f34c..e245f34c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp
index bfd5ef86..bfd5ef86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp
index ca99edc6..ca99edc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp
index 583c7fa1..583c7fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp
index b0ce9a06..b0ce9a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp
index 713018e4..713018e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp
index 3287be1c..3287be1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp
index ec80e915..ec80e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp
index e6537641..e6537641 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp
index 9ee98743..9ee98743 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp
index 47463232..47463232 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp
index e92da160..e92da160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp
index 535c3be7..535c3be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp
index aa56008a..aa56008a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp
index 35dd772f..35dd772f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp
index 975dc82c..975dc82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp
index 94444cf9..94444cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp
index 699025fc..699025fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp
index 080c9233..080c9233 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp
index c381f91c..c381f91c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp
index 5df154f3..5df154f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp
index 680d6d51..680d6d51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h
index 21fe1c44..21fe1c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp
index aa1938e8..aa1938e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp
index 00694ce9..00694ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp
new file mode 100644
index 00000000..9b001a44
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp
@@ -0,0 +1,12 @@
+namespace Constants
+{
+double PI = 3.14;
+}
+int factor = 41;
+double result = Constants::PI * factor;
+
+return Constants::PI * factor;
+
+void func(int value) {
+    return SomeClass(value, Constants::PI * value);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp
index 71f67f75..71f67f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp
index d7fcf753..d7fcf753 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp
index 5170b9a9..5170b9a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1462.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp
index 4ab5eea8..4ab5eea8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp
index 795bb572..795bb572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp
index 2d5d1204..2d5d1204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp
index a1adcf5f..a1adcf5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp
index b324fbda..b324fbda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp
index 78958bb1..78958bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp
index 14a85090..14a85090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp
index f9768c40..f9768c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp
index 26444ad3..26444ad3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp
index 92731c19..92731c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp
index d19718f5..d19718f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp
index 9da12944..9da12944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp
index 753d9519..753d9519 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp
index 03c4a828..03c4a828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp
index 4c582e86..4c582e86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp
index 4865da64..4865da64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp
index 382beced..382beced 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp
index f356c302..f356c302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp
index 38253f15..38253f15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp
index b36e182a..b36e182a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp
index 8baaeb1c..8baaeb1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp
index 230b96b3..230b96b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp
index f8b0f8a8..f8b0f8a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp
index 869320c0..869320c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp
index 148201b0..148201b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp
index e9229a8e..e9229a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h
index ea503b10..ea503b10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h
index 8ff7bfca..8ff7bfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp
index 512d2e45..512d2e45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp
index eb51f587..eb51f587 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp
index 06da6b3e..06da6b3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp
index bc7e687f..bc7e687f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp
index ea141156..ea141156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp
index 294e3afb..294e3afb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp
index b3b51488..b3b51488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp
index 647570f2..647570f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp
index 857d48f7..857d48f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp
index 2a4e6b8f..2a4e6b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp
index 3c5951a8..3c5951a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp
index 3b4de434..3b4de434 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp
index d0773475..d0773475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp
index 7b93e223..7b93e223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp
index 3ef21f1f..3ef21f1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp
index 88f77e34..88f77e34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h
index 8f1fc31f..8f1fc31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp
index 0f9e8155..0f9e8155 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp
index b0b77452..b0b77452 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp
index 07cc31fe..07cc31fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp
index 6777bfa5..6777bfa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp
index d3f89db7..d3f89db7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp
index 270f0695..270f0695 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp
index d2878656..d2878656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp
index 4666e464..4666e464 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp
index 28da2d74..28da2d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp
index 85669bc6..85669bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp
new file mode 100644
index 00000000..11f92ee3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp
@@ -0,0 +1,26 @@
+void bar()
+{
+	foo(42, {1, 2, 3, 4});
+	foo(42,
+	    {1, 2, 3, 4});
+
+	foo(42, vector{1, 2, 3, 4});
+	foo(42,
+	    vector{1, 2, 3, 4});
+	foo(42, vector
+	    {1, 2, 3, 4});
+
+	foo(42, vector<int>{1, 2, 3, 4});
+	foo(42,
+	    vector<int>{1, 2, 3, 4});
+	foo(42, vector<int>
+	    {1, 2, 3, 4});
+	foo(42, vector
+	    <int>{1, 2, 3, 4});
+
+	foo(42, decltype(something){1, 2, 3, 4});
+	foo(42,
+	    decltype(something){1, 2, 3, 4});
+	foo(42, decltype(something)
+	    {1, 2, 3, 4});
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp
index 421ff658..421ff658 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp
index d558e7f6..d558e7f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp
index 0bcab0d9..0bcab0d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h
index ea539afa..ea539afa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp
index 05eb69cf..05eb69cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp
index af06e31a..af06e31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h
index 0048604d..0048604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp
index 8885e36b..8885e36b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp
index adb5a6ab..adb5a6ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp
index 542a0fd2..542a0fd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h
index 25253f09..25253f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp
index a5ae87d5..a5ae87d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp
index 121ea044..121ea044 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp
index 73dab5ec..73dab5ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp
index 403bf773..403bf773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp
index f0d1773d..f0d1773d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp
index 46abf36a..46abf36a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp
index c3c9366d..c3c9366d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp
index ba463284..ba463284 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp
index 422cb1bf..422cb1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp
index 1544fd74..1544fd74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp
index 69e924ee..69e924ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp
index fff916e3..fff916e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp
index abfb70c7..abfb70c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp
index 57cfddf5..57cfddf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp
index cb9fc307..cb9fc307 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp
index fd622c3c..fd622c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp
index a0a58f85..a0a58f85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
new file mode 100644
index 00000000..8753aee2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
@@ -0,0 +1,7 @@
+class A

+{

+   void func1(){

+      // comment

+      }

+   void func2(){auto result = 1 + 2 + 3 + 4;}

+};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp
index 4e228311..4e228311 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp
index 7f87591e..7f87591e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h
index 2ba9933f..2ba9933f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h
index 42ce2c53..42ce2c53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp
index 8bde6273..8bde6273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp
index 7f29676e..7f29676e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h
index e4943e50..e4943e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp
index 24e90a37..24e90a37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp
index 0a729f01..0a729f01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp
index 0014b110..0014b110 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp
index c62548f8..c62548f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp
index 7685f614..7685f614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp
index cbfacf62..cbfacf62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp
index 1b073b45..1b073b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp
index 6467560f..6467560f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp
index 64a11509..64a11509 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h
index 168b0b3d..168b0b3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp
index 24b187c1..24b187c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp
index 8c62d49b..8c62d49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp
index 7f5e05c4..7f5e05c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp
index 5d2ff4fe..5d2ff4fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp
index b188c210..b188c210 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp
index feb059d3..feb059d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp
index 0f50d182..0f50d182 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp
index 0c8e1c92..0c8e1c92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp
index e4005841..e4005841 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1464.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp
index 912488b3..912488b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1466.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp
index d3e79ff6..d3e79ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp
index 1470d613..1470d613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp
index dda01437..dda01437 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp
index 2c33ec58..2c33ec58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp
index 5cb66589..5cb66589 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp
index 1901e3db..1901e3db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp
index 7fa82285..7fa82285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp
index 8011f572..8011f572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp
index 4d95c7ce..4d95c7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp
index 76f37f92..76f37f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp
index b544f2bf..b544f2bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp
index 52f508f6..52f508f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp
index 6157444b..56633d0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp
@@ -546,7 +546,7 @@ void indent_text(void)
              * { a++;
              *   b--; };
              */
-            next = chunk_get_next_ncnl(pc);
+            next = chunk_get_next_ncnnl(pc);
             if (!chunk_is_newline_between(pc, next))
             {
                frm.pse[frm.pse_tos].indent = next->column;
@@ -698,7 +698,7 @@ void indent_text(void)
           * everything else
           */
 
-         prev = chunk_get_prev_ncnl(pc);
+         prev = chunk_get_prev_ncnnl(pc);
          if ((pc->type == CT_MEMBER) ||
              (pc->type == CT_DC_MEMBER) ||
              ((prev != NULL) &&
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp
index 6cd779a3..6cd779a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp
index 78a924f4..78a924f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp
index 79a7ad65..79a7ad65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp
index a8c4a514..a8c4a514 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h
index c5b39b37..c5b39b37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp
new file mode 100644
index 00000000..d417b5be
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp
@@ -0,0 +1,10 @@
+#include <string>
+
+extern char* externBufferWithAVeryLongName;
+extern unsigned int externBufferSizeWithLongName;
+
+std::string foo()
+{
+    return std::string{ externBufferWithAVeryLongName
+        , externBufferSizeWithLongName };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp
new file mode 100644
index 00000000..8e01afc6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp
@@ -0,0 +1,7 @@
+#include <string>
+
+extern char* externBufferWithAVeryLongName;
+extern unsigned int externBufferSizeWithLongName;
+
+std::string foo{ externBufferWithAVeryLongName
+    , externBufferSizeWithLongName };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp
index 7ddfacbf..7ddfacbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp
index d9fefe24..d9fefe24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp
index 4fbd1b4c..4fbd1b4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h
index f97bd324..f97bd324 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h
index db2ce47d..db2ce47d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h
index 97d57444..97d57444 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp
new file mode 100644
index 00000000..58e24797
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp
@@ -0,0 +1,60 @@
+int foo1()
+{
+	return std::pair<int, int>{
+		1, 2
+		}.first;
+}
+
+int foo2()
+{
+	return
+	 int{3} & 2;
+}
+
+int foo3()
+{
+	constexpr static int x = 3;
+	return
+	 decltype(x){x} & 2;
+}
+
+int foo4()
+{
+	return
+	new Type();
+}
+
+int foo5()
+{
+	return
+	veryLongMethodCall(
+		arg1,
+		longMethodCall(
+			methodCall(
+				arg2, arg3
+			), arg4
+		)
+	);
+}
+
+int foo6()
+{
+   auto my_lambda = [] ()
+   {
+      return 1 +
+             2 +
+             3;
+
+   };
+}
+
+template<typename U>
+U *
+find(const std::string &name = "") const
+{
+    return find<U>([&name] (auto *pComposite)
+                   {
+                       return name.empty() ||
+                              pComposite->getName() == name;
+                   });
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp
index c194141b..c194141b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp
index 96b38fba..96b38fba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp
index ff8c3e44..ff8c3e44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp
index 703e0422..703e0422 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp
index 54684fa7..54684fa7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp
index 1b76e218..1b76e218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp
index 394cfb63..394cfb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp
index d273ae52..d273ae52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp
index 70451ac4..70451ac4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h
index ff1dcc9b..ff1dcc9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp
index 83188d77..83188d77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp
index bc039e18..bc039e18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp
index e3be4d50..e3be4d50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp
index c12b83d0..c12b83d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp
index 2923a4a2..2923a4a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp
index 4c819605..4c819605 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp
index 4e5685a1..4e5685a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp
index aa324f2e..aa324f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp
index a1ebb1a7..a1ebb1a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp
index 5725d3d7..5725d3d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp
index 5834e4b3..5834e4b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp
new file mode 100644
index 00000000..6e007772
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp
@@ -0,0 +1,41 @@
+obj.AddObject(Object::UniqueName(), 10, [this] {
+    holder.Access([this](const auto &info) {
+    if (IsGood(info)) {
+        Add(info);
+    }
+});
+});
+
+obj.AddObject(
+    Object::UniqueName(),
+    10,
+    [this] {
+    holder.Access([this](const auto &info) {
+    if (IsGood(info)) {
+        Add(info);
+    }
+});
+}
+);
+
+{
+    obj.AddObject(Object::UniqueName(), 10, [this] {
+        holder.Access([this](const auto &info) {
+        if (IsGood(info)) {
+            Add(info);
+        }
+    });
+    });
+
+    obj.AddObject(
+        Object::UniqueName(),
+        10,
+        [this] {
+        holder.Access([this](const auto &info) {
+        if (IsGood(info)) {
+            Add(info);
+        }
+    });
+    }
+    );
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp
new file mode 100644
index 00000000..fcdcc715
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp
@@ -0,0 +1,213 @@
+// Singular with various newline formats
+auto f = [] -> void {
+    return;
+};
+
+auto f = [] -> void {
+    return;
+}();
+
+auto f = [] -> void
+{
+    return;
+}();
+
+auto f = 
+[] -> void {
+    return;
+};
+
+auto f = 
+[] -> void
+{
+    return;
+};
+
+auto f
+    = [] -> void {
+        int i = 0;
+        return;
+    };
+
+auto f
+    = []
+      {
+          int i = 0;
+          return;
+      };
+
+// Nested lambda
+auto f = [] {
+    auto g = [] {
+        auto h = [] {
+            return;
+        };
+        return;
+    };
+    return;
+};
+
+auto f = [] {
+    auto g = []
+    {
+        auto h = [] {
+            return;
+        };
+        return;
+    };
+    return;
+};
+
+auto f = []
+{
+    auto g = [] {
+        auto h = []
+        {
+            return;
+        };
+        return;
+    };
+    return;
+};
+
+// Nested lambda within functions
+Func(
+    [] { return; },
+    [] { return; }
+);
+
+Func([] { return; },
+    [] { return; }
+);
+
+Func([] { return; },
+    [] { return; }
+)();
+
+Func([] { return; },
+    [] { return; })();
+
+Func([] { return; },
+    [] { return; });
+
+A(
+        B([] (const std::string &s) -> bool {
+            s = "hello";
+            return true;
+            }), 1
+        );
+
+A(
+        B(
+            [] (const std::string &s) -> bool {
+            s = "hello";
+            return true;
+            }
+            ), 1
+        );
+
+// Inside scope
+{
+    std::thread([](const char *c) {
+            std::cout << c << std::endl;
+        }).detach();
+
+    std::thread(
+            [](const char *c) {
+            std::cout << c << std::endl;
+        }
+        ).detach();
+
+    auto f = [&](int a) {
+            return b;
+        };
+
+    auto f = [&](int a)
+    {
+            return b;
+        };
+}
+
+Func(std::count_if(v.begin(), v.end(), [&](const auto &a) {
+            return a == 3;
+    }));
+
+Func(
+        std::count_if(v.begin(), v.end(), [&](const auto &a)
+            {
+            return a == 3;
+    }));
+
+Func(
+        std::count_if(v.begin(), v.end(), [&](const auto &a) {
+            return a == 3;
+    }));
+
+Func(
+        std::count_if(v.begin(), v.end(), [&](const auto &a) {
+            return a == 3;
+    })
+    );
+
+// Test case from issue #3116
+const auto compare = [] (const auto i, const auto j)
+{
+    return i >= j;
+};
+
+std::sort(
+    vector.begin(),
+    vector.end(),
+    [] (const auto i, const auto j)
+{
+    return i >= j;
+}
+);
+
+// Test case from issue #3116
+if(isWidgetOfCurrentRow)
+{
+    it = std::find_if(
+            reloaded.begin(),
+            reloaded.end(),
+            [&rowGuid](const auto& device)
+            {
+            return (device.thingGUID == rowGuid && !device.isWidget);
+            }
+            );
+}
+else
+{
+    it = std::find_if(
+            reloaded.begin(),
+            reloaded.end(),
+            [&rowGuid](const auto& device)
+            {
+            return device.thingGUID == rowGuid;
+            }
+            );
+}
+
+// Test case from issue 1296 and some variants
+obj->Func([&](int a)
+        {
+        return b;
+        });
+
+obj->Func([] -> int
+        {
+        return b;
+        });
+
+obj->Func([]
+        {
+        return b;
+        }
+        );
+
+obj->Func(
+        Func([]
+        {
+        return b;
+        })
+        );
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp
index 0c289a8a..0c289a8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp
index 18995f7b..96e910ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp
@@ -1,12 +1,13 @@
 class A {

 // crash (two parameter, 2nd string parameter has space)

-void check( const QObject* object, const QStringList& strList = QStringList(QString(QLatin1String("one two"))));

+void check( const QObject* object, const QStringList& strList=QStringList(QString(QLatin1String("one two"))));

 // no crash (two parameter, 2nd string parameter has no space)

-void check( const QObject* object, const QStringList& strList = QStringList(QString(QLatin1String("one"))));

+void check( const QObject* object, const QStringList& strList= QStringList(QString(QLatin1String("one"))));

 // no crash (removed QLatin1String)

-void check( const QObject* object, const QStringList& strList = QStringList(QString(("one two"))));

+void check( const QObject* object, const QStringList& strList =QStringList(QString(("one two"))));

 // no crash (removed QString(QLatin1String))

 void check( const QObject* object, const QStringList& strList = QStringList());

 // no crash (removed 1st parameter only)

 void check( const QStringList& strList = QStringList(QString(QLatin1String("one two"))) );

 };

+int A=5;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp
index e99742ef..e99742ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp
index 6d8dde90..6d8dde90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp
index e57868e2..e57868e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp
index d167cc1c..d167cc1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp
index bdc499a6..bdc499a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp
index d641c281..d641c281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp
new file mode 100644
index 00000000..da3db41f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp
@@ -0,0 +1,9 @@
+template<typename T, typename U>
+auto add(T t, U u) -> decltype(t + u) {return t + u;}
+
+int main()
+{
+	auto f1 = [&]() {   return 1;   };
+	auto f2 = [&]() -> decltype(auto) {   return 2;   };
+	string s1{   'a', 'b'   };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp
index 543290fa..543290fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp
index a7638876..a7638876 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp
index 89fe4435..89fe4435 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp
index c27c6b5d..c27c6b5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp
index 8a73b431..8a73b431 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp
index f1be4478..f1be4478 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp
index c7c10d6c..c7c10d6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp
index 725fa160..725fa160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp
index 570a4a76..570a4a76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp
index ca3105da..ca3105da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp
index 213393b9..213393b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp
index df5f3a84..df5f3a84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp
index 828215e8..828215e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h
index 128974b7..128974b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h
index a436fcb7..a436fcb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h
index 34c42d45..fb77edf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h
@@ -54,7 +54,9 @@ void foo4();
 class I
 {
 };
-
+using namespace F;
+namespace M
+{
 void bar4();
 /* multiline test comment
    before class */
@@ -74,3 +76,20 @@ class K
 class L { };
 };
 };
+}
+
+class AA;
+class AB;
+
+namespace BA
+{
+class BB;
+class BC;
+
+class BD
+{
+public:
+  friend class BE;
+  BD();
+};
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp
index c7cab4c7..c7cab4c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp
index b698546a..b698546a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp
index e27d7e55..e27d7e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp
index 96cd4826..96cd4826 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp
index 309a65a9..309a65a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp
index 91a7184f..91a7184f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp
index f1ba8607..f1ba8607 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp
index 19965aac..19965aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp
index d221e974..d221e974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp
index 26e49663..26e49663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp
index 4bdcb394..4bdcb394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp
index c87e6e68..c87e6e68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp
index e6ea9116..e6ea9116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp
index 4b79ca9e..4b79ca9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp
index 6f2a7f03..6f2a7f03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp
index b14935ee..b14935ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp
index 4563c43b..4563c43b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp
index 6d734b1f..6d734b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp
index 8d9e222e..8d9e222e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h
index ef01470e..ef01470e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp
index 4d55a541..4d55a541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp
index 8ec5657f..8ec5657f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp
index 75b3c46d..75b3c46d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp
index 86ed0a8f..86ed0a8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp
index da61641a..da61641a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp
index 76cfc4bf..76cfc4bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp
index 7a0bcecf..7a0bcecf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp
index 98418c46..98418c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp
index ff0ab369..ff0ab369 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp
index e318c1aa..e318c1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp
index 5037d792..5037d792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp
index 28447084..28447084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp
index f58dfee5..f58dfee5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp
index 85ab1a70..85ab1a70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp
index add2fc4a..add2fc4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
index a344480b..a344480b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp
index 52796f75..52796f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp
index 97dfe0cf..97dfe0cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp
index 69f877ed..69f877ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h
index 58921bc5..58921bc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp
index c7ba93cc..c7ba93cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp
index 0c1d5fc9..0c1d5fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp
index 3f5a98d4..3f5a98d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp
index 8eba4d1e..8eba4d1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp
index 1fc0ded8..1fc0ded8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h
index 29c52879..29c52879 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp
index 7710171e..7710171e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp
index caea467a..caea467a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp
index 18448555..18448555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp
index 6f235d22..6f235d22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp
index 911aa53b..911aa53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp
index ab2096c8..ab2096c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp
index dc5f5e8e..dc5f5e8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp
index 7dd9c14a..7dd9c14a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp
index 796522c7..796522c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
index 45ffb335..45ffb335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp
index bb730d61..bb730d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp
new file mode 100644
index 00000000..7b4bdc5e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp
@@ -0,0 +1,8 @@
+int foo()
+{
+try { foo(bar); } catch (int *e) { return 0; }
+
+if (false) try { throw int(); } catch(...){}
+
+return 1;
+}	
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp
new file mode 100644
index 00000000..b70ef6b1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp
@@ -0,0 +1,9 @@
+//BEGIN real region
+
+int foo()
+{
+    int x = 0; // BEGIN not-region
+    return x;  //END not-region
+}
+
+// END real region
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc
index 6a9b203b..6a9b203b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp
index 83c60dd4..83c60dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
index e25d0496..e25d0496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp
index 3e2f7e47..3e2f7e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp
new file mode 100644
index 00000000..20dac444
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp
@@ -0,0 +1,10 @@
+enum Enum1:int {
+  E31=0,
+  E32=1,
+  E33=2
+};
+enum Enum2 : int {
+  E31=0,
+  E32=1,
+  E33=2
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp
new file mode 100644
index 00000000..90798ef9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp
@@ -0,0 +1,11 @@
+BEGIN_MESSAGE_MAP(CUSB2_camera_developementDlg, CDialog)
+ON_COMMAND(IDC_ESCAPE, On_Escape)
+ON_COMMAND(IDC_8_BIT, On_8_Bit)
+ON_COMMAND(IDC_14_BIT, On_14_Bit)
+ON_COMMAND(IDC_ACQUIRE, On_Acquire)
+ON_COMMAND(IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages)
+ON_COMMAND(IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages)
+ON_WM_PAINT()
+ON_WM_QUERYDRAGICON()
+ON_WM_CTLCOLOR()
+END_MESSAGE_MAP()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp
new file mode 100644
index 00000000..e9b0c428
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp
@@ -0,0 +1,2 @@
+a( , 1);
+typedef SLIST_HEAD( , foo) foo_list_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
index fff4aff4..fff4aff4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp
index f45f1a9a..f45f1a9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp
index 30e058e7..30e058e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp
index 42699d1d..42699d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp
index a2353599..a2353599 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/stdcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp
index 3534461b..3534461b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp
index 1cfea449..1cfea449 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp
index 474aba08..474aba08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp
index dc7a65c4..dc7a65c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h
index 0f102244..0f102244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp
index 137205d0..137205d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp
index 46d41560..46d41560 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp
index 55b11d26..55b11d26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp
new file mode 100644
index 00000000..6f49594d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp
@@ -0,0 +1,61 @@
+void func() { }
+
+// **ABC**
+void func() { }
+// *INDENT-ON*
+
+void func() { }
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the following form:
+ * \verbatim
+
+   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
+
+   where a, b, c, d, and e are real coefficients
+
+ * \endverbatim
+ *
+ * This object's tolerance defines a threshold for root solutions above which iterative methods will be employed to achieve the desired accuracy
+ *
+ * \verbatim - this should cause the following line to not wrap due to cmt_width
+ * Upon success, the roots array contains the solution to the polynomial p(x) = 0
+ * \endverbatim
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+int solve(double a,
+                    double b,
+                 double c,
+                 double d,
+                     double e,
+              std::complex<double> roots[4]);
+
+/**
+ * Function to solve for roots of a generic quartic polynomial of the following form:
+ *
+
+   p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e,
+   where a, b, c, d, and e are real coefficients
+ *
+ * Upon success, root1, root2, root3, and root4 contain the solution to the polynomial p(x) = 0
+ * + Return value on output:
+ * - 0, if an error occurs (invalid coefficients)
+ * - 1, if all roots are real
+ * - 2, if two roots are real and two roots are complex conjugates
+ * - 3, if the roots are two pairs of complex conjugates
+ */
+/* **ABC** */
+              int solve(double a,
+    double b,
+                  double c,
+            double d,
+            double e,
+                     std::complex<double> &root1,
+                  std::complex<double> &root2,
+            std::complex<double> &root3,
+        std::complex<double> &root4);
+/* ??DEF?? */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp
index 6b4a0a39..6b4a0a39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp
index de061955..de061955 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp
index 447f3cbd..447f3cbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp
index 53e74de2..53e74de2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp
index 37a131e0..37a131e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp
index 82854287..82854287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp
index 0cca962b..0cca962b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h
index f522097c..f522097c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp
index 99e01b6e..99e01b6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cpp/wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/1822.cs
index a4269bd9..a4269bd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/615_nested-usings.cs
index 14a31507..14a31507 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/620_getset-brace.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/625_where-constraints.cs
index 09274ab9..09274ab9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/Issue_2705.cs
index 9a1b3172..9a1b3172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11095.mm
index 34ed4050..34ed4050 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11662.cs
index 9a49fdba..9a49fdba 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11993.cs
index 6bc6529a..6bc6529a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-12303.cs
index 01be8291..01be8291 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1288.cs
index 70554a02..70554a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1333.mm
index 5c91693c..5c91693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1333.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1338.cs
index d10b4893..d10b4893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1343.cs
index 852fe640..852fe640 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1345.cs
index e218e6a2..e218e6a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-13955.cs
index 940aa89b..940aa89b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-14131.cs
index c8c3c918..c8c3c918 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-17253.cs
index 7342d82c..7342d82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18437.cs
index aab6c498..aab6c498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18780.cs
index 0eea713e..0eea713e 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18829.cs
index 62c9f8fb..62c9f8fb 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1919.cs
index 956fd0f8..956fd0f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19644.cs
index da76bfbc..da76bfbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1975.cs
index af678a93..af678a93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1977.cs
index e4b1b375..e4b1b375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1978.cs
index 14cbdc7d..14cbdc7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19895.cs
index a22c6fa8..a22c6fa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2007.cs
index 2e9f163a..2e9f163a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2008.cs
index eeb649dd..eeb649dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2020.cs
index 37d9ef23..37d9ef23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2021.cs
index 2b08fafe..2b08fafe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2506.cs
index 7bdbb81a..7bdbb81a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2684.cs
index 0c91b081..0c91b081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2685.cs
index 4c11f20b..4c11f20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-29933.cs
index ed96bc87..ed96bc87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-30498_2.cs
index ba0d8515..ba0d8515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3484.cs
index 1235aa91..1235aa91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-36862.cs
index cb3cb448..cb3cb448 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-36862.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-36862.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-37241.cs
index b2097c4f..b2097c4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-40685.cs
index a2f37547..a2f37547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-9917.cs
index 5bd9dc64..5bd9dc64 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/add-nl-before-namespace.cs
index 93a2cf04..93a2cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/argtypes.mm
index fd2ff142..fd2ff142 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/asm.h.mm
index 97c0edd3..97c0edd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1620.cs
index 0c9d4eb9..0c9d4eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1637.cs
index 1f46d1bc..1f46d1bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1650.cs
index 5c52aece..5c52aece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_600.cs
index 3d93d861..3d93d861 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_620.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_935.cs
index d2c8ec95..d2c8ec95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/bug_i_935.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/casting.mm
index c8022c7b..c8022c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/definesalign.h.mm
index a249d1aa..a249d1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delegate.cs
index 3a4b103c..3a4b103c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delete-space-oc.mm
index 66e24dc8..66e24dc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/exception-filters.cs
index 1e3abca3..1e3abca3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/fncall_as_ctor_in_attr.cs
index cf52b46f..cf52b46f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/generics.cs
index 7bbe04c7..7bbe04c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/getset.cs
index 59aaa5bc..59aaa5bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/gs.cs
index 16adc604..16adc604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcolalign.cs
index d2e40c78..d2e40c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcomment.cs
index 6663a6ca..6663a6ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/indent-multistring-coulmn1.cs
index 56bdf473..56bdf473 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/inttypes.h.mm
index 6e093789..6e093789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mdarray_space.cs
index e5338c11..e5338c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/misc-failures.cs
index 857c06f9..857c06f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
index f8db4f0b..f8db4f0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/new-constraint-paren-space.cs
index 209f2721..209f2721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/newlines.mm
index 31a46376..31a46376 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/newlines.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/objc.mm
index 7f0e706a..7f0e706a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/oneline_property.cs
index 1d7a2c26..1d7a2c26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator-null-conditional.cs
index 530bdd27..530bdd27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/pp-ignore.mm
index 2673008c..2673008c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/property.cs
index 85e08bae..85e08bae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/region.cs
index 4f8667f2..4f8667f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/remove_semi.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf607.cs
index f0617c19..f0617c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf628.cs
index 803c9962..803c9962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/simple.cs
index 30acd134..30acd134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using.cs
index 881b4d5b..881b4d5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using_categ.cs
index 173e42bb..173e42bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sp_between_new_paren.cs
index f5d8381d..f5d8381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/squeeze-paren-close-Option.cs
index 37203f4a..37203f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/string_multi.cs
index 9e715e51..9e715e51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/tcf.cs
index f3ac3664..f3ac3664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/unsafe.cs
index 5dc90cb4..5dc90cb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be.cs
index 13da3090..13da3090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be_no_bom.cs
index 33587b97..33587b97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le.cs
index 3f16b9d0..3f16b9d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le_no_bom.cs
index 4a7f9ccc..4a7f9ccc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/var-member.cs
index 0f7ffb23..0f7ffb23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/verbatim_strings.cs
index 47c3ed4c..47c3ed4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/when.cs
index 2785b894..2785b894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/cs/when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cs/when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/1438.d
index 10a43753..10a43753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/HashMap.d
index 618b3e59..618b3e59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/HashMap.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/Lexer.d
index 004d9d8a..004d9d8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/bug-indent.d
index 321ab6f1..321ab6f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/casts.d
index 42d54916..42d54916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/const.d
index 778957fd..778957fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/d_sp_paren.d
index 2b28a7f1..2b28a7f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/delegate.d
index 0115ae00..0115ae00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/delegate.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/enum.d
index 804ef27c..804ef27c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/extern_.d
index a583b08e..a583b08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/funcfunc.d
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/imports.d
index 758fefb7..758fefb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/invariant.d
index 46a8efdc..46a8efdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/numbers.d
index e51bf8ac..e51bf8ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/sort_import.d
index d929f8e8..d929f8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/square_indent_tab.d
index 1dee3a17..1dee3a17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if.d
index 24e6eaba..24e6eaba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/strings.d
index a62adec3..a62adec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template.d
index ba03e617..ba03e617 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing001.d
index 745e5b36..745e5b36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst01.d
index 3a3728f2..3a3728f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst01.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst02.d
index 0b428d60..0b428d60 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst03.d
index 611f12f9..611f12f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces000.d
index d2f1b642..d2f1b642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces001.d
index a59ab020..a59ab020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces002.d
index 5e45e999..5e45e999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-1.d
index c9f41d3f..c9f41d3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile.d
index c42d1893..c42d1893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/volatile.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/d/wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/d/wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/ecma/example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/ecma/example-1.es
index 0bc9b775..0bc9b775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/ecma/example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/ecma/example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1122.java
index 5712f9ee..5712f9ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1124.java
index dcea4172..dcea4172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1845.java
index cc7656ba..cc7656ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_670.java
index 52d64f1e..52d64f1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation1.java
index d7417542..d7417542 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation2.java
index 596c2562..596c2562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/assert.java
index 8076663b..8076663b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/cast.java
index 8f2d983b..8f2d983b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/double_brace.java
index 8ba15c47..8ba15c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/doxy-javadoc-alignment.java
new file mode 100644
index 00000000..838d765c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/doxy-javadoc-alignment.java
@@ -0,0 +1,79 @@
+/**
+ * @author Firstname Lastname <address @ example.com>
+ * @version 1.6 (current version number of program)
+ * @since 1.2 (the version of the package to which this class was first added)
+ */
+
+/**
+ * Short one line description.                           (1)
+ *
+ * Longer description. If there were any, it would be    (2)
+ * here.
+ *
+ * And even more explanations to follow in consecutive
+ * paragraphs separated by HTML paragraph breaks...
+ * or so we think, haha. After this paragraph, add a
+ * reference to an @param to verify that it is ignored
+ * since it does not occur at the beginning of the line.
+ * Let's also throw in an @return to verify that it passes
+ * the test as well.
+ *
+ * @param variable Description text text text.          (3)
+ * @return Description text text text.
+ */
+
+/**
+ * Validates a chess move.
+ *
+ * Use {@link #doMove(int fromFile, int fromRank, int toFile, int toRank)} to move a piece.
+ *
+ * @param fromFile file from which a piece is being moved
+ * @param fromRank rank from which a piece is being moved
+ * @param toFile file to which a piece is being moved
+ * @param toRank rank to which a piece is being moved
+ * @return true if the move is valid, otherwise false
+ * @since 1.0
+ */
+
+/**
+* Draws as much of the specified image as is currently available
+* with its northwest corner at the specified coordinate (x, y).
+* This method will return immediately in all cases, even if the
+* entire image has not yet been scaled, dithered and converted
+* for the current output device.
+*
+* If the current output representation is not yet complete then
+* the method will return false and the indicated
+* {@link ImageObserver} object will be notified as the
+* conversion process progresses.
+*
+* @param img the image to be drawn
+* @param x,y the x- and y-coordinates of the northwest corner
+* of the destination rectangle in pixels
+* @param observer  the image observer to be notified as more
+* of the image is converted.  May be
+* null
+* @return true if the image is completely
+* loaded and was painted successfully;
+* false otherwise.
+* @see Image
+* @see ImageObserver
+* @since 1.0
+*/
+
+/**
+* @see #create(int, int, int, int)
+* @see #finalize()
+* @see Component#getGraphics()
+* @see Component#paint(Graphics)
+* @see Component#update(Graphics)
+* @since 1.0
+*/
+
+/**
+* Disposes of this graphics context once it is no longer
+* referenced.
+*
+* @see #dispose()
+* @since 1.0
+*/
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/foreach.java
index e475dc29..e475dc29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics.java
index 729013ce..729013ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_return_type.java
index 818ac721..818ac721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/issue_672.java
index 2f632625..2f632625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/long_cl_cmt.java
index 45e5252b..45e5252b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sf567.java
index 68a63221..68a63221 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_angle.java
index 1e11c4c9..1e11c4c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_for_colon.java
index fecd1833..fecd1833 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_this_paren.java
index 628b327f..628b327f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/synchronized.java
index 369394b8..369394b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/try.java
index aea6a7f3..aea6a7f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/variable_aligns.java
index 76c6131c..76c6131c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/java/variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/java/variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/1927.m
index 9f8d7a7b..9f8d7a7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/1927.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Declarations.h
index e1ad3c6b..e1ad3c6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.h
index 364b1de8..364b1de8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.m
index 20994f34..20994f34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2172.m
index 02584e91..02584e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2289.m
index c046cb1e..c046cb1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_681.oc
index fb4c6685..fb4c6685 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/align-objc-like-xcode.m
index 6852ac12..6852ac12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/align-objc-like-xcode.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/attribute_specifier_seqs.mm
index c9b6f24d..c9b6f24d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/available.m
index 8216d17f..8216d17f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_in_method.m
index e0dfcd76..e0dfcd76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_literal_protocol.m
index 02d1cfca..02d1cfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks.m
index 617e0b78..617e0b78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align.m
index 2ddf75c6..2ddf75c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align2.m
index f4e875c9..f4e875c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/box.m
index 98a3516a..98a3516a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/boxed_receiver.m
index 3460b920..3460b920 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1366.m
index 5e81ed4a..5e81ed4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_167.m
index e404e2aa..e404e2aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1674.m
index 82c20161..82c20161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_340.m
index ea9f8201..ea9f8201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_404.m
index 3ecb87f0..3ecb87f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_497.m
index a976d43d..a976d43d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_841.m
index dea826d2..dea826d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_125-412.m
index c92d2e66..c92d2e66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_408.m
index c8a3a450..c8a3a450 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_477.m
index a1a81749..a1a81749 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/c-cpp-oc-wrapper.c
index 663a4cc8..663a4cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cast.m
index daa9cb6d..daa9cb6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type2.m
index 27e31cdc..27e31cdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type3.m
index 8d8676c8..8d8676c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert.m
index 58a4c894..58a4c894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert2.m
index 4a31e975..4a31e975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/code_placeholder.m
index 6245bfa4..6245bfa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/complex_method.m
index b22c34b6..b22c34b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/delete-space-oc.mm
index 66e24dc8..66e24dc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double-indent-objc-dict.m
index f94e5105..f94e5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double_angle_space.m
index f7164498..f7164498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/exceptions.m
index c8d6f6f2..c8d6f6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/extern-c-attribute.m
index fb84ce73..fb84ce73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for.m
index fc159fc6..fc159fc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func_def.mm
index b3655728..b3655728 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh137.m
index 779e0f2f..779e0f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh293.m
index bb4cb52c..bb4cb52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh511.m
index cee32794..cee32794 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-inside-ternary-operator.m
index ff979acf..ff979acf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-inside-ternary-operator.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-objc-block.m
index b882abf5..b882abf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_boxed.m
index c7df968f..c7df968f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_oc_inside_msg_sel.m
index f20cd048..f20cd048 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_single_newline.m
index 27e79e8a..27e79e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2629.m
index e690ea58..e690ea58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2631.m
index 7989b020..7989b020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2675.m
index 1d4cafe2..1d4cafe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2722.m
index 65dcb131..65dcb131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2724.m
index 51c90671..51c90671 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2727.m
index f15542f1..f15542f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_3031.mm
new file mode 100644
index 00000000..028d55d9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/issue_3031.mm
@@ -0,0 +1,4 @@
+ if (flag) {
+      [video fcls:filter.class strength : fv];
+}
+[values forKey:(filterID)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/kw.m
index a4d25624..a4d25624 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/literals.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/literals.mm
index 0f4d004c..98522f3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/literals.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/literals.mm
@@ -27,7 +27,15 @@ void main(int argc, const char *argv[]) {
   NSNumber *noNumber = @NO;             // equivalent to [NSNumber numberWithBool:NO]
 
   // Raw string literals
-  NSString *rawString = [NSString stringWithFormat:@R"(embedded "quotes")"];
+  NSString *rawString = [NSString stringWithFormat:@R"(embedded " quotes " )"];
+  NSString *delimiterRawString = [NSString stringWithFormat:@R"<<<(embedded "quotes ')<<<"];
+  NSString *groupIDString = [NSString stringWithFormat:@R"({"group_id " : " % @",})", groupID];
+  NSString *config = @R"({"config_v1" : [
+  {"op1" : {"type":{"unsupported1":{}}},"markers":[123]},
+  {"op2" : {"type":{"jobs":{"suspend":true,"resume":false}}},"markers":[1]},
+  {"op3" : {"type":{"Good Format":{}}},"markers":[123]}
+  ]})";
+
 
 #ifdef __cplusplus
   NSNumber *trueNumber = @true;         // equivalent to [NSNumber numberWithBool:(BOOL)true]
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/main.m
index f2fdf16a..f2fdf16a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/method_ends_semicolon.m
index e3c5637e..e3c5637e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/misc.m
index 5038a14c..5038a14c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks.m
index eab01db0..eab01db0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks_2.m
index 55636ae5..55636ae5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg.m
index cca460f9..cca460f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg_align.m
index 3b61a051..3b61a051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
index ea132bab..ea132bab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ns_enum.m
index cdd729d8..cdd729d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc-split.m
index 3b656bfc..3b656bfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_cond_colon.m
index 50cf56b5..50cf56b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/oc_msg_in_pp.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/properties.m
index 4de60057..4de60057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/protocol.m
index 31a8b86f..31a8b86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/react_native.m
index eadf314f..eadf314f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/react_native.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/react_native.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/real_world_file.m
index 26ec3cb2..26ec3cb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/real_world_file.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/receiver.m
index 274d4130..274d4130 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/return_type.m
index 62a5c246..62a5c246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/selector.m
index a5a89475..a5a89475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import.m
index 1a227b7e..1a227b7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import_group.m
index 9e14f0fc..9e14f0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sort_import_group.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_angle.m
index 259d2011..259d2011 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_oc_msg_receiver.m
index aad36be5..aad36be5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_before_oc_proto_list.m
index c0d96bdb..c0d96bdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_inside_braces_oc_dict.m
index 272a2f28..272a2f28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_boxed.m
index 0c6948c0..0c6948c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_catch.m
index a5354dfe..a5354dfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_classname_paren-r.m
index 1076bbb3..1076bbb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_synchronized.m
index e4de748b..e4de748b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/string.m
index f3fca80f..f3fca80f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ternary.m
index 3fdddd93..3fdddd93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/typeof.m
index d5183a1d..d5183a1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/oc/typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/oc/typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/Issue_2586.pawn
index 89558691..89558691 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/comment.p
index 785521ac..785521ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/crusty_ex-1.sma
index 35ee0515..35ee0515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/enum.pawn
index 588efc35..588efc35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/functions.pawn
index cdda5e05..cdda5e05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/preproc.pawn
index e15d360e..e15d360e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/rpn_calc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/rpn_calc.pawn
index 2965d9c7..2965d9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/rpn_calc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/rpn_calc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/str-escape.p
index 5600eae3..5600eae3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/switch-vsemi.sma
index c2efacfb..c2efacfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/tags.pawn
index 4193b2a7..4193b2a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/test1.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/test1.pawn
index ecefe6e0..ecefe6e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/test1.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/test1.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/traffic.p
index f5cf0f7f..f5cf0f7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/unbraced.p
index 10c41663..10c41663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/pawn/unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/pawn/unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/sql/issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/issue_527.sqc
index 5514ff31..5514ff31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/sql/issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/sql/mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/mysql.sqc
index 197c2847..197c2847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/sql/mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/sql/sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/sta-select.sqc
index 863edf5b..863edf5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/sql/sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/sql/sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2090.vala
index 22698792..22698792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2270.vala
index 7bb897d8..7bb897d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/advanced.vala
index 2b85c031..2b85c031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/advanced.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/gh287.vala
index fcb6fca6..fcb6fca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/gh287.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/list.vala
index e9b48acc..e9b48acc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/list.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/preproc.vala
index 3ab2ccc8..3ab2ccc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str.vala
index 11f19c01..11f19c01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str2.vala
index 9d8798b7..9d8798b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/input/vala/verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/vala/verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/java.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/java.test
index ffc6ca3b..314b8778 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/java.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/java.test
@@ -22,6 +22,7 @@
 80064  mod_add_long_class_closebrace_comment-1.cfg  java/long_cl_cmt.java
 80065  empty.cfg                            java/Java8DoubleColon.java
 80066  sp_after_for_colon.cfg               java/sp_after_for_colon.java
+80067  doxy-javadoc-alignment.cfg           java/doxy-javadoc-alignment.java
 
 80100  align_same_func_call_params-t.cfg    java/sf567.java
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/objective-c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/objective-c.test
index e28b30ee..23e02a10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/objective-c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/objective-c.test
@@ -12,7 +12,7 @@
 50006  oc6.cfg                              oc/exceptions.m
 50007  oc7.cfg                              oc/misc.m
 50008  oc8.cfg                              oc/protocol.m
-50009  oc9.cfg                              oc/literals.m
+50009  oc9.cfg                              oc/literals.mm
 
 50010  sp_after_oc_return_type_add.cfg      oc/return_type.m
 50011  sp_after_oc_return_type_force.cfg    oc/return_type.m
@@ -89,6 +89,7 @@
 50204  sp_block_as_argument4.cfg            oc/blocks_align.m
 50205  sp_block_as_argument5.cfg            oc/msg_align.m
 50206  aet.cfg                              oc/issue_2727.m
+50207  issue_3031.cfg                       oc/issue_3031.mm
 
 50300  sp_after_send_oc_colon-f.cfg         oc/msg.m
 
@@ -172,7 +173,7 @@
 
 #
 # adopt tests from UT
-10018  empty.cfg                            oc/delete-space-oc.mm
+10018  delete-space-oc.cfg                  oc/delete-space-oc.mm
 10019  empty.cfg                            oc/func-param-wrap-oc.mm
 10020  align-objc-like-xcode.cfg            oc/align-objc-like-xcode.m
 10021  double-indent-objc-dict.cfg          oc/double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/pawn.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/pawn.test
index 7f92b452..7f92b452 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/pawn.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/pawn.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/run_format_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_format_tests.py
index 671188c2..671188c2 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/run_format_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_format_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/run_sources_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_sources_tests.py
index ebbc6623..ebbc6623 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/run_sources_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_sources_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/run_test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_test.py
index 7b5a9d57..7b5a9d57 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/run_test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/run_test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/staging.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/staging.test
index 8c5284d5..8c5284d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/staging.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/staging.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/__init__.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/__init__.py
index bf83b667..bf83b667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/__init__.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/__init__.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/ansicolor.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/ansicolor.py
index 44d6dbd5..44d6dbd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/ansicolor.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/ansicolor.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/config.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/config.py
index 4370816d..4370816d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/config.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/config.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/failure.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/failure.py
index 0972930f..0972930f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/failure.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/failure.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/selector.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/selector.py
index 93646257..93646257 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/selector.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/selector.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/test.py
index 5f33fbbb..5f33fbbb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/utilities.py b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/utilities.py
index 2d930222..2d930222 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/test_uncrustify/utilities.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/test_uncrustify/utilities.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/tests.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/tests.vpj
index a5ed4fd3..a5ed4fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/tests.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/tests.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/vala.test b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/vala.test
index d2305595..d2305595 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/tests/vala.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/vala.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/uncrustify.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpj
index 97b2b50a..97b2b50a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/uncrustify.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/uncrustify.vpw b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpw
index 245d8153..245d8153 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/uncrustify.vpw
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/uncrustify.vpw
diff --git a/debian/uncrustify-trinity/uncrustify-trinity_0.72.0.orig.tar.xz b/debian/uncrustify-trinity/uncrustify-trinity_0.72.0.orig.tar.xz
deleted file mode 100644
index 7122731e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity_0.72.0.orig.tar.xz
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity_0.73.0.orig.tar.gz b/debian/uncrustify-trinity/uncrustify-trinity_0.73.0.orig.tar.gz
new file mode 100644
index 00000000..78ba6a62
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity_0.73.0.orig.tar.gz